Skip to content

Commit

Permalink
spi: gpio: Use devm_spi_register_master()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
ndreys authored and broonie committed Apr 8, 2019
1 parent 45beec3 commit 79567c1
Showing 1 changed file with 4 additions and 15 deletions.
19 changes: 4 additions & 15 deletions drivers/spi/spi-gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -396,8 +396,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;
Expand Down Expand Up @@ -437,19 +435,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);
Expand All @@ -460,7 +450,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);

Expand Down

0 comments on commit 79567c1

Please sign in to comment.