lkml.org 
[lkml]   [2019]   [Apr]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 12/12] spi: gpio: Use devm_spi_register_master()
Date
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
---
drivers/spi/spi-gpio.c | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c
index 668f2cd82d98..674432bbbbc2 100644
--- a/drivers/spi/spi-gpio.c
+++ b/drivers/spi/spi-gpio.c
@@ -397,8 +397,6 @@ static int spi_gpio_probe(struct platform_device *pdev)

spi_gpio = spi_master_get_devdata(master);

- platform_set_drvdata(pdev, spi_gpio);
-
status = spi_gpio_request(dev, spi_gpio);
if (status)
return status;
@@ -438,19 +436,11 @@ static int spi_gpio_probe(struct platform_device *pdev)
}
bb->setup_transfer = spi_bitbang_setup_transfer;

- return spi_bitbang_start(&spi_gpio->bitbang);
-}
-
-static int spi_gpio_remove(struct platform_device *pdev)
-{
- struct spi_gpio *spi_gpio;
-
- spi_gpio = platform_get_drvdata(pdev);
-
- /* stop() unregisters child devices too */
- spi_bitbang_stop(&spi_gpio->bitbang);
+ status = spi_bitbang_init(&spi_gpio->bitbang);
+ if (status)
+ return status;

- return 0;
+ return devm_spi_register_master(&pdev->dev, spi_master_get(master));
}

MODULE_ALIAS("platform:" DRIVER_NAME);
@@ -461,7 +451,6 @@ static struct platform_driver spi_gpio_driver = {
.of_match_table = of_match_ptr(spi_gpio_dt_ids),
},
.probe = spi_gpio_probe,
- .remove = spi_gpio_remove,
};
module_platform_driver(spi_gpio_driver);

--
2.20.1
\
 
 \ /
  Last update: 2019-04-03 06:03    [W:0.252 / U:0.432 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site