nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

spi: gpio: Use devm_spi_register_master()

Browse source 
Replace spi_bitbang_start() with a combination of spi_bitbang_init()
and devm_spi_register_master() and drop all of the explicit
cleanup-related code that's no longer necessary.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Chris Healy <cphealy@gmail.com>
Cc: linux-spi@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Andrey Smirnov 2019-04-02 21:01:33 -07:00 committed by Mark Brown
parent 45beec3519
commit 79567c1a32
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
1 changed files with 4 additions and 15 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/spi/spi-gpio.c
View file

@ -396,8 +396,6 @@ static int spi_gpio_probe(struct platform_device *pdev)
spi_gpio = spi_master_get_devdata(master); spi_gpio = spi_master_get_devdata(master);
platform_set_drvdata(pdev, spi_gpio);
status = spi_gpio_request(dev, spi_gpio); status = spi_gpio_request(dev, spi_gpio);
if (status) if (status)
return status; return status;
@ -437,19 +435,11 @@ static int spi_gpio_probe(struct platform_device *pdev)
} }
bb->setup_transfer = spi_bitbang_setup_transfer; bb->setup_transfer = spi_bitbang_setup_transfer;
return spi_bitbang_start(&spi_gpio->bitbang); status = spi_bitbang_init(&spi_gpio->bitbang);
} if (status)
return status;
static int spi_gpio_remove(struct platform_device *pdev) return devm_spi_register_master(&pdev->dev, spi_master_get(master));
{
struct spi_gpio *spi_gpio;
spi_gpio = platform_get_drvdata(pdev);
/* stop() unregisters child devices too */
spi_bitbang_stop(&spi_gpio->bitbang);
return 0;
} }
MODULE_ALIAS("platform:" DRIVER_NAME); MODULE_ALIAS("platform:" DRIVER_NAME);
@ -460,7 +450,6 @@ static struct platform_driver spi_gpio_driver = {
.of_match_table = of_match_ptr(spi_gpio_dt_ids), .of_match_table = of_match_ptr(spi_gpio_dt_ids),
}, },
.probe = spi_gpio_probe, .probe = spi_gpio_probe,
.remove = spi_gpio_remove,
}; };
module_platform_driver(spi_gpio_driver); module_platform_driver(spi_gpio_driver);