mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
spi: Convert to platform remove callback returning
Merge series from Uwe Kleine-König <u.kleine-koenig@pengutronix.de>: This patch series adapts the platform drivers below drivers/spi to use the .remove_new() callback. Compared to the traditional .remove() callback .remove_new() returns no value. This is a good thing because the driver core doesn't (and cannot) cope for errors during remove. The only effect of a non-zero return value in .remove() is that the driver core emits a warning. The device is removed anyhow and an early return from .remove() usually yields a resource leak. By changing the remove callback to return void driver authors cannot reasonably assume any more that there is some kind of cleanup later. All drivers touched here returned zero unconditionally in their remove callback, so they could all be converted trivially to .remove_new().
This commit is contained in:
Mark Brown
commit
2289fa0704
84 changed files with 170 additions and 323 deletions
|
|
@ -220,7 +220,7 @@ static int ar934x_spi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int ar934x_spi_remove(struct platform_device *pdev)
|
||||
static void ar934x_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_controller *ctlr;
|
||||
struct ar934x_spi *sp;
|
||||
|
|
@ -230,8 +230,6 @@ static int ar934x_spi_remove(struct platform_device *pdev)
|
|||
|
||||
spi_unregister_controller(ctlr);
|
||||
clk_disable_unprepare(sp->clk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct platform_driver ar934x_spi_driver = {
|
||||
|
|
@ -240,7 +238,7 @@ static struct platform_driver ar934x_spi_driver = {
|
|||
.of_match_table = ar934x_spi_match,
|
||||
},
|
||||
.probe = ar934x_spi_probe,
|
||||
.remove = ar934x_spi_remove,
|
||||
.remove_new = ar934x_spi_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(ar934x_spi_driver);
|
||||
|
|
|
|||
|
|
@ -908,14 +908,12 @@ static int a3700_spi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int a3700_spi_remove(struct platform_device *pdev)
|
||||
static void a3700_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_controller *host = platform_get_drvdata(pdev);
|
||||
struct a3700_spi *spi = spi_controller_get_devdata(host);
|
||||
|
||||
clk_unprepare(spi->clk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct platform_driver a3700_spi_driver = {
|
||||
|
|
@ -924,7 +922,7 @@ static struct platform_driver a3700_spi_driver = {
|
|||
.of_match_table = of_match_ptr(a3700_spi_dt_ids),
|
||||
},
|
||||
.probe = a3700_spi_probe,
|
||||
.remove = a3700_spi_remove,
|
||||
.remove_new = a3700_spi_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(a3700_spi_driver);
|
||||
|
|
|
|||
|
|
@ -787,13 +787,12 @@ static int aspeed_spi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int aspeed_spi_remove(struct platform_device *pdev)
|
||||
static void aspeed_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct aspeed_spi *aspi = platform_get_drvdata(pdev);
|
||||
|
||||
aspeed_spi_enable(aspi, false);
|
||||
clk_disable_unprepare(aspi->clk);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -1201,7 +1200,7 @@ MODULE_DEVICE_TABLE(of, aspeed_spi_matches);
|
|||
|
||||
static struct platform_driver aspeed_spi_driver = {
|
||||
.probe = aspeed_spi_probe,
|
||||
.remove = aspeed_spi_remove,
|
||||
.remove_new = aspeed_spi_remove,
|
||||
.driver = {
|
||||
.name = DEVICE_NAME,
|
||||
.of_match_table = aspeed_spi_matches,
|
||||
|
|
|
|||
|
|
@ -647,15 +647,13 @@ __maybe_unused static int at91_usart_spi_resume(struct device *dev)
|
|||
return spi_controller_resume(ctrl);
|
||||
}
|
||||
|
||||
static int at91_usart_spi_remove(struct platform_device *pdev)
|
||||
static void at91_usart_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_controller *ctlr = platform_get_drvdata(pdev);
|
||||
struct at91_usart_spi *aus = spi_controller_get_devdata(ctlr);
|
||||
|
||||
at91_usart_spi_release_dma(ctlr);
|
||||
clk_disable_unprepare(aus->clk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct dev_pm_ops at91_usart_spi_pm_ops = {
|
||||
|
|
@ -670,7 +668,7 @@ static struct platform_driver at91_usart_spi_driver = {
|
|||
.pm = &at91_usart_spi_pm_ops,
|
||||
},
|
||||
.probe = at91_usart_spi_probe,
|
||||
.remove = at91_usart_spi_remove,
|
||||
.remove_new = at91_usart_spi_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(at91_usart_spi_driver);
|
||||
|
|
|
|||
|
|
@ -237,7 +237,7 @@ static int ath79_spi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int ath79_spi_remove(struct platform_device *pdev)
|
||||
static void ath79_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct ath79_spi *sp = platform_get_drvdata(pdev);
|
||||
|
||||
|
|
@ -245,8 +245,6 @@ static int ath79_spi_remove(struct platform_device *pdev)
|
|||
ath79_spi_disable(sp);
|
||||
clk_disable_unprepare(sp->clk);
|
||||
spi_controller_put(sp->bitbang.master);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void ath79_spi_shutdown(struct platform_device *pdev)
|
||||
|
|
@ -262,7 +260,7 @@ MODULE_DEVICE_TABLE(of, ath79_spi_of_match);
|
|||
|
||||
static struct platform_driver ath79_spi_driver = {
|
||||
.probe = ath79_spi_probe,
|
||||
.remove = ath79_spi_remove,
|
||||
.remove_new = ath79_spi_remove,
|
||||
.shutdown = ath79_spi_shutdown,
|
||||
.driver = {
|
||||
.name = DRV_NAME,
|
||||
|
|
|
|||
|
|
@ -1596,7 +1596,7 @@ static int atmel_spi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int atmel_spi_remove(struct platform_device *pdev)
|
||||
static void atmel_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_controller *host = platform_get_drvdata(pdev);
|
||||
struct atmel_spi *as = spi_controller_get_devdata(host);
|
||||
|
|
@ -1627,8 +1627,6 @@ static int atmel_spi_remove(struct platform_device *pdev)
|
|||
|
||||
pm_runtime_put_noidle(&pdev->dev);
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int atmel_spi_runtime_suspend(struct device *dev)
|
||||
|
|
@ -1712,7 +1710,7 @@ static struct platform_driver atmel_spi_driver = {
|
|||
.of_match_table = atmel_spi_dt_ids,
|
||||
},
|
||||
.probe = atmel_spi_probe,
|
||||
.remove = atmel_spi_remove,
|
||||
.remove_new = atmel_spi_remove,
|
||||
};
|
||||
module_platform_driver(atmel_spi_driver);
|
||||
|
||||
|
|
|
|||
|
|
@ -923,7 +923,7 @@ static int au1550_spi_probe(struct platform_device *pdev)
|
|||
return err;
|
||||
}
|
||||
|
||||
static int au1550_spi_remove(struct platform_device *pdev)
|
||||
static void au1550_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct au1550_spi *hw = platform_get_drvdata(pdev);
|
||||
|
||||
|
|
@ -942,7 +942,6 @@ static int au1550_spi_remove(struct platform_device *pdev)
|
|||
}
|
||||
|
||||
spi_master_put(hw->master);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* work with hotplug and coldplug */
|
||||
|
|
@ -950,7 +949,7 @@ MODULE_ALIAS("platform:au1550-spi");
|
|||
|
||||
static struct platform_driver au1550_spi_drv = {
|
||||
.probe = au1550_spi_probe,
|
||||
.remove = au1550_spi_remove,
|
||||
.remove_new = au1550_spi_remove,
|
||||
.driver = {
|
||||
.name = "au1550-spi",
|
||||
},
|
||||
|
|
|
|||
|
|
@ -554,7 +554,7 @@ static int spi_engine_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int spi_engine_remove(struct platform_device *pdev)
|
||||
static void spi_engine_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = spi_master_get(platform_get_drvdata(pdev));
|
||||
struct spi_engine *spi_engine = spi_master_get_devdata(master);
|
||||
|
|
@ -572,8 +572,6 @@ static int spi_engine_remove(struct platform_device *pdev)
|
|||
|
||||
clk_disable_unprepare(spi_engine->ref_clk);
|
||||
clk_disable_unprepare(spi_engine->clk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id spi_engine_match_table[] = {
|
||||
|
|
@ -584,7 +582,7 @@ MODULE_DEVICE_TABLE(of, spi_engine_match_table);
|
|||
|
||||
static struct platform_driver spi_engine_driver = {
|
||||
.probe = spi_engine_probe,
|
||||
.remove = spi_engine_remove,
|
||||
.remove_new = spi_engine_remove,
|
||||
.driver = {
|
||||
.name = "spi-engine",
|
||||
.of_match_table = spi_engine_match_table,
|
||||
|
|
|
|||
|
|
@ -567,7 +567,7 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev)
|
|||
return err;
|
||||
}
|
||||
|
||||
static int bcm2835aux_spi_remove(struct platform_device *pdev)
|
||||
static void bcm2835aux_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct bcm2835aux_spi *bs = spi_master_get_devdata(master);
|
||||
|
|
@ -580,8 +580,6 @@ static int bcm2835aux_spi_remove(struct platform_device *pdev)
|
|||
|
||||
/* disable the HW block by releasing the clock */
|
||||
clk_disable_unprepare(bs->clk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id bcm2835aux_spi_match[] = {
|
||||
|
|
@ -596,7 +594,7 @@ static struct platform_driver bcm2835aux_spi_driver = {
|
|||
.of_match_table = bcm2835aux_spi_match,
|
||||
},
|
||||
.probe = bcm2835aux_spi_probe,
|
||||
.remove = bcm2835aux_spi_remove,
|
||||
.remove_new = bcm2835aux_spi_remove,
|
||||
};
|
||||
module_platform_driver(bcm2835aux_spi_driver);
|
||||
|
||||
|
|
|
|||
|
|
@ -878,7 +878,7 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev)
|
|||
}
|
||||
|
||||
|
||||
static int bcm63xx_hsspi_remove(struct platform_device *pdev)
|
||||
static void bcm63xx_hsspi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct bcm63xx_hsspi *bs = spi_master_get_devdata(master);
|
||||
|
|
@ -888,8 +888,6 @@ static int bcm63xx_hsspi_remove(struct platform_device *pdev)
|
|||
clk_disable_unprepare(bs->pll_clk);
|
||||
clk_disable_unprepare(bs->clk);
|
||||
sysfs_remove_group(&pdev->dev.kobj, &bcm63xx_hsspi_group);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
|
|
@ -946,7 +944,7 @@ static struct platform_driver bcm63xx_hsspi_driver = {
|
|||
.of_match_table = bcm63xx_hsspi_of_match,
|
||||
},
|
||||
.probe = bcm63xx_hsspi_probe,
|
||||
.remove = bcm63xx_hsspi_remove,
|
||||
.remove_new = bcm63xx_hsspi_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(bcm63xx_hsspi_driver);
|
||||
|
|
|
|||
|
|
@ -605,7 +605,7 @@ static int bcm63xx_spi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int bcm63xx_spi_remove(struct platform_device *pdev)
|
||||
static void bcm63xx_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct bcm63xx_spi *bs = spi_master_get_devdata(master);
|
||||
|
|
@ -615,8 +615,6 @@ static int bcm63xx_spi_remove(struct platform_device *pdev)
|
|||
|
||||
/* HW shutdown */
|
||||
clk_disable_unprepare(bs->clk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
|
|
@ -660,7 +658,7 @@ static struct platform_driver bcm63xx_spi_driver = {
|
|||
},
|
||||
.id_table = bcm63xx_spi_dev_match,
|
||||
.probe = bcm63xx_spi_probe,
|
||||
.remove = bcm63xx_spi_remove,
|
||||
.remove_new = bcm63xx_spi_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(bcm63xx_spi_driver);
|
||||
|
|
|
|||
|
|
@ -576,7 +576,7 @@ static int bcmbca_hsspi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int bcmbca_hsspi_remove(struct platform_device *pdev)
|
||||
static void bcmbca_hsspi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct bcmbca_hsspi *bs = spi_master_get_devdata(master);
|
||||
|
|
@ -586,8 +586,6 @@ static int bcmbca_hsspi_remove(struct platform_device *pdev)
|
|||
clk_disable_unprepare(bs->pll_clk);
|
||||
clk_disable_unprepare(bs->clk);
|
||||
sysfs_remove_group(&pdev->dev.kobj, &bcmbca_hsspi_group);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
|
|
@ -644,7 +642,7 @@ static struct platform_driver bcmbca_hsspi_driver = {
|
|||
.of_match_table = bcmbca_hsspi_of_match,
|
||||
},
|
||||
.probe = bcmbca_hsspi_probe,
|
||||
.remove = bcmbca_hsspi_remove,
|
||||
.remove_new = bcmbca_hsspi_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(bcmbca_hsspi_driver);
|
||||
|
|
|
|||
|
|
@ -21,16 +21,14 @@ static int brcmstb_qspi_probe(struct platform_device *pdev)
|
|||
return bcm_qspi_probe(pdev, NULL);
|
||||
}
|
||||
|
||||
static int brcmstb_qspi_remove(struct platform_device *pdev)
|
||||
static void brcmstb_qspi_remove(struct platform_device *pdev)
|
||||
{
|
||||
bcm_qspi_remove(pdev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct platform_driver brcmstb_qspi_driver = {
|
||||
.probe = brcmstb_qspi_probe,
|
||||
.remove = brcmstb_qspi_remove,
|
||||
.remove_new = brcmstb_qspi_remove,
|
||||
.driver = {
|
||||
.name = "brcmstb_qspi",
|
||||
.pm = &bcm_qspi_pm_ops,
|
||||
|
|
|
|||
|
|
@ -1795,7 +1795,7 @@ static int cqspi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int cqspi_remove(struct platform_device *pdev)
|
||||
static void cqspi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct cqspi_st *cqspi = platform_get_drvdata(pdev);
|
||||
|
||||
|
|
@ -1809,8 +1809,6 @@ static int cqspi_remove(struct platform_device *pdev)
|
|||
|
||||
pm_runtime_put_sync(&pdev->dev);
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
|
|
@ -1910,7 +1908,7 @@ MODULE_DEVICE_TABLE(of, cqspi_dt_ids);
|
|||
|
||||
static struct platform_driver cqspi_platform_driver = {
|
||||
.probe = cqspi_probe,
|
||||
.remove = cqspi_remove,
|
||||
.remove_new = cqspi_remove,
|
||||
.driver = {
|
||||
.name = CQSPI_NAME,
|
||||
.pm = CQSPI_DEV_PM_OPS,
|
||||
|
|
|
|||
|
|
@ -625,7 +625,7 @@ static int cdns_spi_probe(struct platform_device *pdev)
|
|||
*
|
||||
* Return: 0 on success and error value on error
|
||||
*/
|
||||
static int cdns_spi_remove(struct platform_device *pdev)
|
||||
static void cdns_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct cdns_spi *xspi = spi_master_get_devdata(master);
|
||||
|
|
@ -638,8 +638,6 @@ static int cdns_spi_remove(struct platform_device *pdev)
|
|||
pm_runtime_disable(&pdev->dev);
|
||||
|
||||
spi_unregister_master(master);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -739,7 +737,7 @@ MODULE_DEVICE_TABLE(of, cdns_spi_of_match);
|
|||
/* cdns_spi_driver - This structure defines the SPI subsystem platform driver */
|
||||
static struct platform_driver cdns_spi_driver = {
|
||||
.probe = cdns_spi_probe,
|
||||
.remove = cdns_spi_remove,
|
||||
.remove_new = cdns_spi_remove,
|
||||
.driver = {
|
||||
.name = CDNS_SPI_NAME,
|
||||
.of_match_table = cdns_spi_of_match,
|
||||
|
|
|
|||
|
|
@ -69,15 +69,13 @@ static int octeon_spi_probe(struct platform_device *pdev)
|
|||
return err;
|
||||
}
|
||||
|
||||
static int octeon_spi_remove(struct platform_device *pdev)
|
||||
static void octeon_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct octeon_spi *p = spi_master_get_devdata(master);
|
||||
|
||||
/* Clear the CSENA* and put everything in a known state. */
|
||||
writeq(0, p->register_base + OCTEON_SPI_CFG(p));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id octeon_spi_match[] = {
|
||||
|
|
@ -92,7 +90,7 @@ static struct platform_driver octeon_spi_driver = {
|
|||
.of_match_table = octeon_spi_match,
|
||||
},
|
||||
.probe = octeon_spi_probe,
|
||||
.remove = octeon_spi_remove,
|
||||
.remove_new = octeon_spi_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(octeon_spi_driver);
|
||||
|
|
|
|||
|
|
@ -434,7 +434,7 @@ static int mcfqspi_probe(struct platform_device *pdev)
|
|||
return status;
|
||||
}
|
||||
|
||||
static int mcfqspi_remove(struct platform_device *pdev)
|
||||
static void mcfqspi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct mcfqspi *mcfqspi = spi_master_get_devdata(master);
|
||||
|
|
@ -445,8 +445,6 @@ static int mcfqspi_remove(struct platform_device *pdev)
|
|||
|
||||
mcfqspi_cs_teardown(mcfqspi);
|
||||
clk_disable_unprepare(mcfqspi->clk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
|
|
@ -509,7 +507,7 @@ static struct platform_driver mcfqspi_driver = {
|
|||
.driver.owner = THIS_MODULE,
|
||||
.driver.pm = &mcfqspi_pm,
|
||||
.probe = mcfqspi_probe,
|
||||
.remove = mcfqspi_remove,
|
||||
.remove_new = mcfqspi_remove,
|
||||
};
|
||||
module_platform_driver(mcfqspi_driver);
|
||||
|
||||
|
|
|
|||
|
|
@ -1018,7 +1018,7 @@ static int davinci_spi_probe(struct platform_device *pdev)
|
|||
* It will also call spi_bitbang_stop to destroy the work queue which was
|
||||
* created by spi_bitbang_start.
|
||||
*/
|
||||
static int davinci_spi_remove(struct platform_device *pdev)
|
||||
static void davinci_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct davinci_spi *dspi;
|
||||
struct spi_master *master;
|
||||
|
|
@ -1036,7 +1036,6 @@ static int davinci_spi_remove(struct platform_device *pdev)
|
|||
}
|
||||
|
||||
spi_master_put(master);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct platform_driver davinci_spi_driver = {
|
||||
|
|
@ -1045,7 +1044,7 @@ static struct platform_driver davinci_spi_driver = {
|
|||
.of_match_table = of_match_ptr(davinci_spi_of_match),
|
||||
},
|
||||
.probe = davinci_spi_probe,
|
||||
.remove = davinci_spi_remove,
|
||||
.remove_new = davinci_spi_remove,
|
||||
};
|
||||
module_platform_driver(davinci_spi_driver);
|
||||
|
||||
|
|
|
|||
|
|
@ -781,7 +781,7 @@ static int dln2_spi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int dln2_spi_remove(struct platform_device *pdev)
|
||||
static void dln2_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct dln2_spi *dln2 = spi_master_get_devdata(master);
|
||||
|
|
@ -790,8 +790,6 @@ static int dln2_spi_remove(struct platform_device *pdev)
|
|||
|
||||
if (dln2_spi_enable(dln2, false) < 0)
|
||||
dev_err(&pdev->dev, "Failed to disable SPI module\n");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
|
|
@ -873,7 +871,7 @@ static struct platform_driver spi_dln2_driver = {
|
|||
.pm = &dln2_spi_pm,
|
||||
},
|
||||
.probe = dln2_spi_probe,
|
||||
.remove = dln2_spi_remove,
|
||||
.remove_new = dln2_spi_remove,
|
||||
};
|
||||
module_platform_driver(spi_dln2_driver);
|
||||
|
||||
|
|
|
|||
|
|
@ -308,7 +308,7 @@ static int dw_spi_bt1_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int dw_spi_bt1_remove(struct platform_device *pdev)
|
||||
static void dw_spi_bt1_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct dw_spi_bt1 *dwsbt1 = platform_get_drvdata(pdev);
|
||||
|
||||
|
|
@ -317,8 +317,6 @@ static int dw_spi_bt1_remove(struct platform_device *pdev)
|
|||
pm_runtime_disable(&pdev->dev);
|
||||
|
||||
clk_disable_unprepare(dwsbt1->clk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id dw_spi_bt1_of_match[] = {
|
||||
|
|
@ -330,7 +328,7 @@ MODULE_DEVICE_TABLE(of, dw_spi_bt1_of_match);
|
|||
|
||||
static struct platform_driver dw_spi_bt1_driver = {
|
||||
.probe = dw_spi_bt1_probe,
|
||||
.remove = dw_spi_bt1_remove,
|
||||
.remove_new = dw_spi_bt1_remove,
|
||||
.driver = {
|
||||
.name = "bt1-sys-ssi",
|
||||
.of_match_table = dw_spi_bt1_of_match,
|
||||
|
|
|
|||
|
|
@ -328,7 +328,7 @@ static int dw_spi_mmio_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int dw_spi_mmio_remove(struct platform_device *pdev)
|
||||
static void dw_spi_mmio_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct dw_spi_mmio *dwsmmio = platform_get_drvdata(pdev);
|
||||
|
||||
|
|
@ -337,8 +337,6 @@ static int dw_spi_mmio_remove(struct platform_device *pdev)
|
|||
clk_disable_unprepare(dwsmmio->pclk);
|
||||
clk_disable_unprepare(dwsmmio->clk);
|
||||
reset_control_assert(dwsmmio->rstc);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id dw_spi_mmio_of_match[] = {
|
||||
|
|
@ -366,7 +364,7 @@ MODULE_DEVICE_TABLE(acpi, dw_spi_mmio_acpi_match);
|
|||
|
||||
static struct platform_driver dw_spi_mmio_driver = {
|
||||
.probe = dw_spi_mmio_probe,
|
||||
.remove = dw_spi_mmio_remove,
|
||||
.remove_new = dw_spi_mmio_remove,
|
||||
.driver = {
|
||||
.name = DRIVER_NAME,
|
||||
.of_match_table = dw_spi_mmio_of_match,
|
||||
|
|
|
|||
|
|
@ -745,14 +745,12 @@ static int ep93xx_spi_probe(struct platform_device *pdev)
|
|||
return error;
|
||||
}
|
||||
|
||||
static int ep93xx_spi_remove(struct platform_device *pdev)
|
||||
static void ep93xx_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct ep93xx_spi *espi = spi_master_get_devdata(master);
|
||||
|
||||
ep93xx_spi_release_dma(espi);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct platform_driver ep93xx_spi_driver = {
|
||||
|
|
@ -760,7 +758,7 @@ static struct platform_driver ep93xx_spi_driver = {
|
|||
.name = "ep93xx-spi",
|
||||
},
|
||||
.probe = ep93xx_spi_probe,
|
||||
.remove = ep93xx_spi_remove,
|
||||
.remove_new = ep93xx_spi_remove,
|
||||
};
|
||||
module_platform_driver(ep93xx_spi_driver);
|
||||
|
||||
|
|
|
|||
|
|
@ -1425,7 +1425,7 @@ static int dspi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int dspi_remove(struct platform_device *pdev)
|
||||
static void dspi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct fsl_dspi *dspi = platform_get_drvdata(pdev);
|
||||
|
||||
|
|
@ -1444,8 +1444,6 @@ static int dspi_remove(struct platform_device *pdev)
|
|||
if (dspi->irq)
|
||||
free_irq(dspi->irq, dspi);
|
||||
clk_disable_unprepare(dspi->clk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void dspi_shutdown(struct platform_device *pdev)
|
||||
|
|
@ -1459,7 +1457,7 @@ static struct platform_driver fsl_dspi_driver = {
|
|||
.driver.owner = THIS_MODULE,
|
||||
.driver.pm = &dspi_pm,
|
||||
.probe = dspi_probe,
|
||||
.remove = dspi_remove,
|
||||
.remove_new = dspi_remove,
|
||||
.shutdown = dspi_shutdown,
|
||||
};
|
||||
module_platform_driver(fsl_dspi_driver);
|
||||
|
|
|
|||
|
|
@ -783,11 +783,9 @@ static int of_fsl_espi_probe(struct platform_device *ofdev)
|
|||
return fsl_espi_probe(dev, &mem, irq, num_cs);
|
||||
}
|
||||
|
||||
static int of_fsl_espi_remove(struct platform_device *dev)
|
||||
static void of_fsl_espi_remove(struct platform_device *dev)
|
||||
{
|
||||
pm_runtime_disable(&dev->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
|
|
@ -837,7 +835,7 @@ static struct platform_driver fsl_espi_driver = {
|
|||
.pm = &espi_pm,
|
||||
},
|
||||
.probe = of_fsl_espi_probe,
|
||||
.remove = of_fsl_espi_remove,
|
||||
.remove_new = of_fsl_espi_remove,
|
||||
};
|
||||
module_platform_driver(fsl_espi_driver);
|
||||
|
||||
|
|
|
|||
|
|
@ -937,7 +937,7 @@ static int fsl_lpspi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int fsl_lpspi_remove(struct platform_device *pdev)
|
||||
static void fsl_lpspi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_controller *controller = platform_get_drvdata(pdev);
|
||||
struct fsl_lpspi_data *fsl_lpspi =
|
||||
|
|
@ -946,7 +946,6 @@ static int fsl_lpspi_remove(struct platform_device *pdev)
|
|||
fsl_lpspi_dma_exit(controller);
|
||||
|
||||
pm_runtime_disable(fsl_lpspi->dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __maybe_unused fsl_lpspi_suspend(struct device *dev)
|
||||
|
|
@ -983,7 +982,7 @@ static struct platform_driver fsl_lpspi_driver = {
|
|||
.pm = &fsl_lpspi_pm_ops,
|
||||
},
|
||||
.probe = fsl_lpspi_probe,
|
||||
.remove = fsl_lpspi_remove,
|
||||
.remove_new = fsl_lpspi_remove,
|
||||
};
|
||||
module_platform_driver(fsl_lpspi_driver);
|
||||
|
||||
|
|
|
|||
|
|
@ -948,7 +948,7 @@ static int fsl_qspi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int fsl_qspi_remove(struct platform_device *pdev)
|
||||
static void fsl_qspi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct fsl_qspi *q = platform_get_drvdata(pdev);
|
||||
|
||||
|
|
@ -959,8 +959,6 @@ static int fsl_qspi_remove(struct platform_device *pdev)
|
|||
fsl_qspi_clk_disable_unprep(q);
|
||||
|
||||
mutex_destroy(&q->lock);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int fsl_qspi_suspend(struct device *dev)
|
||||
|
|
@ -1000,7 +998,7 @@ static struct platform_driver fsl_qspi_driver = {
|
|||
.pm = &fsl_qspi_pm_ops,
|
||||
},
|
||||
.probe = fsl_qspi_probe,
|
||||
.remove = fsl_qspi_remove,
|
||||
.remove_new = fsl_qspi_remove,
|
||||
};
|
||||
module_platform_driver(fsl_qspi_driver);
|
||||
|
||||
|
|
|
|||
|
|
@ -716,13 +716,12 @@ static int of_fsl_spi_probe(struct platform_device *ofdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int of_fsl_spi_remove(struct platform_device *ofdev)
|
||||
static void of_fsl_spi_remove(struct platform_device *ofdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(ofdev);
|
||||
struct mpc8xxx_spi *mpc8xxx_spi = spi_master_get_devdata(master);
|
||||
|
||||
fsl_spi_cpm_free(mpc8xxx_spi);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct platform_driver of_fsl_spi_driver = {
|
||||
|
|
@ -731,7 +730,7 @@ static struct platform_driver of_fsl_spi_driver = {
|
|||
.of_match_table = of_fsl_spi_match,
|
||||
},
|
||||
.probe = of_fsl_spi_probe,
|
||||
.remove = of_fsl_spi_remove,
|
||||
.remove_new = of_fsl_spi_remove,
|
||||
};
|
||||
|
||||
#ifdef CONFIG_MPC832x_RDB
|
||||
|
|
@ -763,20 +762,18 @@ static int plat_mpc8xxx_spi_probe(struct platform_device *pdev)
|
|||
return PTR_ERR_OR_ZERO(master);
|
||||
}
|
||||
|
||||
static int plat_mpc8xxx_spi_remove(struct platform_device *pdev)
|
||||
static void plat_mpc8xxx_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct mpc8xxx_spi *mpc8xxx_spi = spi_master_get_devdata(master);
|
||||
|
||||
fsl_spi_cpm_free(mpc8xxx_spi);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
MODULE_ALIAS("platform:mpc8xxx_spi");
|
||||
static struct platform_driver mpc8xxx_spi_driver = {
|
||||
.probe = plat_mpc8xxx_spi_probe,
|
||||
.remove = plat_mpc8xxx_spi_remove,
|
||||
.remove_new = plat_mpc8xxx_spi_remove,
|
||||
.driver = {
|
||||
.name = "mpc8xxx_spi",
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1114,7 +1114,7 @@ static int spi_geni_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int spi_geni_remove(struct platform_device *pdev)
|
||||
static void spi_geni_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *spi = platform_get_drvdata(pdev);
|
||||
struct spi_geni_master *mas = spi_master_get_devdata(spi);
|
||||
|
|
@ -1126,7 +1126,6 @@ static int spi_geni_remove(struct platform_device *pdev)
|
|||
|
||||
free_irq(mas->irq, spi);
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __maybe_unused spi_geni_runtime_suspend(struct device *dev)
|
||||
|
|
@ -1208,7 +1207,7 @@ MODULE_DEVICE_TABLE(of, spi_geni_dt_match);
|
|||
|
||||
static struct platform_driver spi_geni_driver = {
|
||||
.probe = spi_geni_probe,
|
||||
.remove = spi_geni_remove,
|
||||
.remove_new = spi_geni_remove,
|
||||
.driver = {
|
||||
.name = "geni_spi",
|
||||
.pm = &spi_geni_pm_ops,
|
||||
|
|
|
|||
|
|
@ -523,15 +523,13 @@ static int hisi_spi_probe(struct platform_device *pdev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int hisi_spi_remove(struct platform_device *pdev)
|
||||
static void hisi_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_controller *master = platform_get_drvdata(pdev);
|
||||
struct hisi_spi *hs = spi_controller_get_devdata(master);
|
||||
|
||||
debugfs_remove_recursive(hs->debugfs);
|
||||
spi_unregister_controller(master);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct acpi_device_id hisi_spi_acpi_match[] = {
|
||||
|
|
@ -542,7 +540,7 @@ MODULE_DEVICE_TABLE(acpi, hisi_spi_acpi_match);
|
|||
|
||||
static struct platform_driver hisi_spi_driver = {
|
||||
.probe = hisi_spi_probe,
|
||||
.remove = hisi_spi_remove,
|
||||
.remove_new = hisi_spi_remove,
|
||||
.driver = {
|
||||
.name = "hisi-kunpeng-spi",
|
||||
.acpi_match_table = hisi_spi_acpi_match,
|
||||
|
|
|
|||
|
|
@ -665,7 +665,7 @@ static int img_spfi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int img_spfi_remove(struct platform_device *pdev)
|
||||
static void img_spfi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct img_spfi *spfi = spi_master_get_devdata(master);
|
||||
|
|
@ -680,8 +680,6 @@ static int img_spfi_remove(struct platform_device *pdev)
|
|||
clk_disable_unprepare(spfi->spfi_clk);
|
||||
clk_disable_unprepare(spfi->sys_clk);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
|
|
@ -758,7 +756,7 @@ static struct platform_driver img_spfi_driver = {
|
|||
.of_match_table = of_match_ptr(img_spfi_of_match),
|
||||
},
|
||||
.probe = img_spfi_probe,
|
||||
.remove = img_spfi_remove,
|
||||
.remove_new = img_spfi_remove,
|
||||
};
|
||||
module_platform_driver(img_spfi_driver);
|
||||
|
||||
|
|
|
|||
|
|
@ -127,11 +127,9 @@ static int bcm_iproc_probe(struct platform_device *pdev)
|
|||
return bcm_qspi_probe(pdev, soc_intc);
|
||||
}
|
||||
|
||||
static int bcm_iproc_remove(struct platform_device *pdev)
|
||||
static void bcm_iproc_remove(struct platform_device *pdev)
|
||||
{
|
||||
bcm_qspi_remove(pdev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id bcm_iproc_of_match[] = {
|
||||
|
|
@ -143,7 +141,7 @@ MODULE_DEVICE_TABLE(of, bcm_iproc_of_match);
|
|||
|
||||
static struct platform_driver bcm_iproc_driver = {
|
||||
.probe = bcm_iproc_probe,
|
||||
.remove = bcm_iproc_remove,
|
||||
.remove_new = bcm_iproc_remove,
|
||||
.driver = {
|
||||
.name = "bcm_iproc",
|
||||
.pm = &bcm_qspi_pm_ops,
|
||||
|
|
|
|||
|
|
@ -1017,7 +1017,7 @@ static int lantiq_ssc_probe(struct platform_device *pdev)
|
|||
return err;
|
||||
}
|
||||
|
||||
static int lantiq_ssc_remove(struct platform_device *pdev)
|
||||
static void lantiq_ssc_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct lantiq_ssc_spi *spi = platform_get_drvdata(pdev);
|
||||
|
||||
|
|
@ -1030,13 +1030,11 @@ static int lantiq_ssc_remove(struct platform_device *pdev)
|
|||
destroy_workqueue(spi->wq);
|
||||
clk_disable_unprepare(spi->spi_clk);
|
||||
clk_put(spi->fpi_clk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct platform_driver lantiq_ssc_driver = {
|
||||
.probe = lantiq_ssc_probe,
|
||||
.remove = lantiq_ssc_remove,
|
||||
.remove_new = lantiq_ssc_remove,
|
||||
.driver = {
|
||||
.name = "spi-lantiq-ssc",
|
||||
.of_match_table = lantiq_ssc_match,
|
||||
|
|
|
|||
|
|
@ -910,7 +910,7 @@ static int meson_spicc_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int meson_spicc_remove(struct platform_device *pdev)
|
||||
static void meson_spicc_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct meson_spicc_device *spicc = platform_get_drvdata(pdev);
|
||||
|
||||
|
|
@ -921,8 +921,6 @@ static int meson_spicc_remove(struct platform_device *pdev)
|
|||
clk_disable_unprepare(spicc->pclk);
|
||||
|
||||
spi_master_put(spicc->master);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct meson_spicc_data meson_spicc_gx_data = {
|
||||
|
|
@ -967,7 +965,7 @@ MODULE_DEVICE_TABLE(of, meson_spicc_of_match);
|
|||
|
||||
static struct platform_driver meson_spicc_driver = {
|
||||
.probe = meson_spicc_probe,
|
||||
.remove = meson_spicc_remove,
|
||||
.remove_new = meson_spicc_remove,
|
||||
.driver = {
|
||||
.name = "meson-spicc",
|
||||
.of_match_table = of_match_ptr(meson_spicc_of_match),
|
||||
|
|
|
|||
|
|
@ -355,7 +355,7 @@ static int meson_spifc_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int meson_spifc_remove(struct platform_device *pdev)
|
||||
static void meson_spifc_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct meson_spifc *spifc = spi_master_get_devdata(master);
|
||||
|
|
@ -363,8 +363,6 @@ static int meson_spifc_remove(struct platform_device *pdev)
|
|||
pm_runtime_get_sync(&pdev->dev);
|
||||
clk_disable_unprepare(spifc->clk);
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
|
|
@ -442,7 +440,7 @@ MODULE_DEVICE_TABLE(of, meson_spifc_dt_match);
|
|||
|
||||
static struct platform_driver meson_spifc_driver = {
|
||||
.probe = meson_spifc_probe,
|
||||
.remove = meson_spifc_remove,
|
||||
.remove_new = meson_spifc_remove,
|
||||
.driver = {
|
||||
.name = "meson-spifc",
|
||||
.of_match_table = of_match_ptr(meson_spifc_dt_match),
|
||||
|
|
|
|||
|
|
@ -566,7 +566,7 @@ static int mchp_coreqspi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int mchp_coreqspi_remove(struct platform_device *pdev)
|
||||
static void mchp_coreqspi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct mchp_coreqspi *qspi = platform_get_drvdata(pdev);
|
||||
u32 control = readl_relaxed(qspi->regs + REG_CONTROL);
|
||||
|
|
@ -575,8 +575,6 @@ static int mchp_coreqspi_remove(struct platform_device *pdev)
|
|||
control &= ~CONTROL_ENABLE;
|
||||
writel_relaxed(control, qspi->regs + REG_CONTROL);
|
||||
clk_disable_unprepare(qspi->clk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id mchp_coreqspi_of_match[] = {
|
||||
|
|
@ -591,7 +589,7 @@ static struct platform_driver mchp_coreqspi_driver = {
|
|||
.name = "microchip,coreqspi",
|
||||
.of_match_table = mchp_coreqspi_of_match,
|
||||
},
|
||||
.remove = mchp_coreqspi_remove,
|
||||
.remove_new = mchp_coreqspi_remove,
|
||||
};
|
||||
module_platform_driver(mchp_coreqspi_driver);
|
||||
|
||||
|
|
|
|||
|
|
@ -566,7 +566,7 @@ static int mchp_corespi_probe(struct platform_device *pdev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int mchp_corespi_remove(struct platform_device *pdev)
|
||||
static void mchp_corespi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct mchp_corespi *spi = spi_master_get_devdata(master);
|
||||
|
|
@ -574,8 +574,6 @@ static int mchp_corespi_remove(struct platform_device *pdev)
|
|||
mchp_corespi_disable_ints(spi);
|
||||
clk_disable_unprepare(spi->clk);
|
||||
mchp_corespi_disable(spi);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#define MICROCHIP_SPI_PM_OPS (NULL)
|
||||
|
|
@ -599,7 +597,7 @@ static struct platform_driver mchp_corespi_driver = {
|
|||
.pm = MICROCHIP_SPI_PM_OPS,
|
||||
.of_match_table = of_match_ptr(mchp_corespi_dt_ids),
|
||||
},
|
||||
.remove = mchp_corespi_remove,
|
||||
.remove_new = mchp_corespi_remove,
|
||||
};
|
||||
module_platform_driver(mchp_corespi_driver);
|
||||
MODULE_DESCRIPTION("Microchip coreSPI SPI controller driver");
|
||||
|
|
|
|||
|
|
@ -513,7 +513,7 @@ static int mpc52xx_spi_probe(struct platform_device *op)
|
|||
return rc;
|
||||
}
|
||||
|
||||
static int mpc52xx_spi_remove(struct platform_device *op)
|
||||
static void mpc52xx_spi_remove(struct platform_device *op)
|
||||
{
|
||||
struct spi_master *master = spi_master_get(platform_get_drvdata(op));
|
||||
struct mpc52xx_spi *ms = spi_master_get_devdata(master);
|
||||
|
|
@ -529,8 +529,6 @@ static int mpc52xx_spi_remove(struct platform_device *op)
|
|||
spi_unregister_master(master);
|
||||
iounmap(ms->regs);
|
||||
spi_master_put(master);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id mpc52xx_spi_match[] = {
|
||||
|
|
@ -545,6 +543,6 @@ static struct platform_driver mpc52xx_spi_of_driver = {
|
|||
.of_match_table = mpc52xx_spi_match,
|
||||
},
|
||||
.probe = mpc52xx_spi_probe,
|
||||
.remove = mpc52xx_spi_remove,
|
||||
.remove_new = mpc52xx_spi_remove,
|
||||
};
|
||||
module_platform_driver(mpc52xx_spi_of_driver);
|
||||
|
|
|
|||
|
|
@ -934,7 +934,7 @@ static int mtk_nor_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int mtk_nor_remove(struct platform_device *pdev)
|
||||
static void mtk_nor_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_controller *ctlr = dev_get_drvdata(&pdev->dev);
|
||||
struct mtk_nor *sp = spi_controller_get_devdata(ctlr);
|
||||
|
|
@ -944,8 +944,6 @@ static int mtk_nor_remove(struct platform_device *pdev)
|
|||
pm_runtime_dont_use_autosuspend(&pdev->dev);
|
||||
|
||||
mtk_nor_disable_clk(sp);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __maybe_unused mtk_nor_runtime_suspend(struct device *dev)
|
||||
|
|
@ -999,7 +997,7 @@ static struct platform_driver mtk_nor_driver = {
|
|||
.pm = &mtk_nor_pm_ops,
|
||||
},
|
||||
.probe = mtk_nor_probe,
|
||||
.remove = mtk_nor_remove,
|
||||
.remove_new = mtk_nor_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(mtk_nor_driver);
|
||||
|
|
|
|||
|
|
@ -1506,7 +1506,7 @@ static int mtk_snand_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int mtk_snand_remove(struct platform_device *pdev)
|
||||
static void mtk_snand_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_controller *ctlr = platform_get_drvdata(pdev);
|
||||
struct mtk_snand *ms = spi_controller_get_devdata(ctlr);
|
||||
|
|
@ -1515,12 +1515,11 @@ static int mtk_snand_remove(struct platform_device *pdev)
|
|||
mtk_snand_disable_clk(ms);
|
||||
mtk_ecc_release(ms->ecc);
|
||||
kfree(ms->buf);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct platform_driver mtk_snand_driver = {
|
||||
.probe = mtk_snand_probe,
|
||||
.remove = mtk_snand_remove,
|
||||
.remove_new = mtk_snand_remove,
|
||||
.driver = {
|
||||
.name = "mtk-snand",
|
||||
.of_match_table = mtk_snand_ids,
|
||||
|
|
|
|||
|
|
@ -818,7 +818,7 @@ static int mxic_spi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int mxic_spi_remove(struct platform_device *pdev)
|
||||
static void mxic_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct mxic_spi *mxic = spi_master_get_devdata(master);
|
||||
|
|
@ -826,8 +826,6 @@ static int mxic_spi_remove(struct platform_device *pdev)
|
|||
pm_runtime_disable(&pdev->dev);
|
||||
mxic_spi_mem_ecc_remove(mxic);
|
||||
spi_unregister_master(master);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id mxic_spi_of_ids[] = {
|
||||
|
|
@ -838,7 +836,7 @@ MODULE_DEVICE_TABLE(of, mxic_spi_of_ids);
|
|||
|
||||
static struct platform_driver mxic_spi_driver = {
|
||||
.probe = mxic_spi_probe,
|
||||
.remove = mxic_spi_remove,
|
||||
.remove_new = mxic_spi_remove,
|
||||
.driver = {
|
||||
.name = "mxic-spi",
|
||||
.of_match_table = mxic_spi_of_ids,
|
||||
|
|
|
|||
|
|
@ -638,7 +638,7 @@ static int mxs_spi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int mxs_spi_remove(struct platform_device *pdev)
|
||||
static void mxs_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master;
|
||||
struct mxs_spi *spi;
|
||||
|
|
@ -653,13 +653,11 @@ static int mxs_spi_remove(struct platform_device *pdev)
|
|||
mxs_spi_runtime_suspend(&pdev->dev);
|
||||
|
||||
dma_release_channel(ssp->dmach);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct platform_driver mxs_spi_driver = {
|
||||
.probe = mxs_spi_probe,
|
||||
.remove = mxs_spi_remove,
|
||||
.remove_new = mxs_spi_remove,
|
||||
.driver = {
|
||||
.name = DRIVER_NAME,
|
||||
.of_match_table = mxs_spi_dt_ids,
|
||||
|
|
|
|||
|
|
@ -762,12 +762,11 @@ static int npcm_fiu_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int npcm_fiu_remove(struct platform_device *pdev)
|
||||
static void npcm_fiu_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct npcm_fiu_spi *fiu = platform_get_drvdata(pdev);
|
||||
|
||||
clk_disable_unprepare(fiu->clk);
|
||||
return 0;
|
||||
}
|
||||
|
||||
MODULE_DEVICE_TABLE(of, npcm_fiu_dt_ids);
|
||||
|
|
@ -779,7 +778,7 @@ static struct platform_driver npcm_fiu_driver = {
|
|||
.of_match_table = npcm_fiu_dt_ids,
|
||||
},
|
||||
.probe = npcm_fiu_probe,
|
||||
.remove = npcm_fiu_remove,
|
||||
.remove_new = npcm_fiu_remove,
|
||||
};
|
||||
module_platform_driver(npcm_fiu_driver);
|
||||
|
||||
|
|
|
|||
|
|
@ -430,15 +430,13 @@ static int npcm_pspi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int npcm_pspi_remove(struct platform_device *pdev)
|
||||
static void npcm_pspi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct npcm_pspi *priv = spi_master_get_devdata(master);
|
||||
|
||||
npcm_pspi_reset_hw(priv);
|
||||
clk_disable_unprepare(priv->clk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id npcm_pspi_match[] = {
|
||||
|
|
@ -454,7 +452,7 @@ static struct platform_driver npcm_pspi_driver = {
|
|||
.of_match_table = npcm_pspi_match,
|
||||
},
|
||||
.probe = npcm_pspi_probe,
|
||||
.remove = npcm_pspi_remove,
|
||||
.remove_new = npcm_pspi_remove,
|
||||
};
|
||||
module_platform_driver(npcm_pspi_driver);
|
||||
|
||||
|
|
|
|||
|
|
@ -1195,7 +1195,7 @@ static int nxp_fspi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int nxp_fspi_remove(struct platform_device *pdev)
|
||||
static void nxp_fspi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct nxp_fspi *f = platform_get_drvdata(pdev);
|
||||
|
||||
|
|
@ -1208,8 +1208,6 @@ static int nxp_fspi_remove(struct platform_device *pdev)
|
|||
|
||||
if (f->ahb_addr)
|
||||
iounmap(f->ahb_addr);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int nxp_fspi_suspend(struct device *dev)
|
||||
|
|
@ -1257,7 +1255,7 @@ static struct platform_driver nxp_fspi_driver = {
|
|||
.pm = &nxp_fspi_pm_ops,
|
||||
},
|
||||
.probe = nxp_fspi_probe,
|
||||
.remove = nxp_fspi_remove,
|
||||
.remove_new = nxp_fspi_remove,
|
||||
};
|
||||
module_platform_driver(nxp_fspi_driver);
|
||||
|
||||
|
|
|
|||
|
|
@ -271,14 +271,13 @@ static int tiny_spi_probe(struct platform_device *pdev)
|
|||
return err;
|
||||
}
|
||||
|
||||
static int tiny_spi_remove(struct platform_device *pdev)
|
||||
static void tiny_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct tiny_spi *hw = platform_get_drvdata(pdev);
|
||||
struct spi_master *master = hw->bitbang.master;
|
||||
|
||||
spi_bitbang_stop(&hw->bitbang);
|
||||
spi_master_put(master);
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_OF
|
||||
|
|
@ -291,7 +290,7 @@ MODULE_DEVICE_TABLE(of, tiny_spi_match);
|
|||
|
||||
static struct platform_driver tiny_spi_driver = {
|
||||
.probe = tiny_spi_probe,
|
||||
.remove = tiny_spi_remove,
|
||||
.remove_new = tiny_spi_remove,
|
||||
.driver = {
|
||||
.name = DRV_NAME,
|
||||
.pm = NULL,
|
||||
|
|
|
|||
|
|
@ -505,7 +505,7 @@ static int uwire_probe(struct platform_device *pdev)
|
|||
return status;
|
||||
}
|
||||
|
||||
static int uwire_remove(struct platform_device *pdev)
|
||||
static void uwire_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct uwire_spi *uwire = platform_get_drvdata(pdev);
|
||||
|
||||
|
|
@ -513,7 +513,6 @@ static int uwire_remove(struct platform_device *pdev)
|
|||
|
||||
spi_bitbang_stop(&uwire->bitbang);
|
||||
uwire_off(uwire);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* work with hotplug and coldplug */
|
||||
|
|
@ -524,7 +523,7 @@ static struct platform_driver uwire_driver = {
|
|||
.name = "omap_uwire",
|
||||
},
|
||||
.probe = uwire_probe,
|
||||
.remove = uwire_remove,
|
||||
.remove_new = uwire_remove,
|
||||
// suspend ... unuse ck
|
||||
// resume ... use ck
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1546,7 +1546,7 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
|
|||
return status;
|
||||
}
|
||||
|
||||
static int omap2_mcspi_remove(struct platform_device *pdev)
|
||||
static void omap2_mcspi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct omap2_mcspi *mcspi = spi_master_get_devdata(master);
|
||||
|
|
@ -1556,8 +1556,6 @@ static int omap2_mcspi_remove(struct platform_device *pdev)
|
|||
pm_runtime_dont_use_autosuspend(mcspi->dev);
|
||||
pm_runtime_put_sync(mcspi->dev);
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* work with hotplug and coldplug */
|
||||
|
|
@ -1610,7 +1608,7 @@ static struct platform_driver omap2_mcspi_driver = {
|
|||
.of_match_table = omap_mcspi_of_match,
|
||||
},
|
||||
.probe = omap2_mcspi_probe,
|
||||
.remove = omap2_mcspi_remove,
|
||||
.remove_new = omap2_mcspi_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(omap2_mcspi_driver);
|
||||
|
|
|
|||
|
|
@ -805,7 +805,7 @@ static int orion_spi_probe(struct platform_device *pdev)
|
|||
}
|
||||
|
||||
|
||||
static int orion_spi_remove(struct platform_device *pdev)
|
||||
static void orion_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct orion_spi *spi = spi_master_get_devdata(master);
|
||||
|
|
@ -816,8 +816,6 @@ static int orion_spi_remove(struct platform_device *pdev)
|
|||
|
||||
spi_unregister_master(master);
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
MODULE_ALIAS("platform:" DRIVER_NAME);
|
||||
|
|
@ -857,7 +855,7 @@ static struct platform_driver orion_spi_driver = {
|
|||
.of_match_table = of_match_ptr(orion_spi_of_match_table),
|
||||
},
|
||||
.probe = orion_spi_probe,
|
||||
.remove = orion_spi_remove,
|
||||
.remove_new = orion_spi_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(orion_spi_driver);
|
||||
|
|
|
|||
|
|
@ -678,7 +678,7 @@ static int pic32_sqi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int pic32_sqi_remove(struct platform_device *pdev)
|
||||
static void pic32_sqi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct pic32_sqi *sqi = platform_get_drvdata(pdev);
|
||||
|
||||
|
|
@ -689,8 +689,6 @@ static int pic32_sqi_remove(struct platform_device *pdev)
|
|||
/* disable clk */
|
||||
clk_disable_unprepare(sqi->base_clk);
|
||||
clk_disable_unprepare(sqi->sys_clk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id pic32_sqi_of_ids[] = {
|
||||
|
|
@ -705,7 +703,7 @@ static struct platform_driver pic32_sqi_driver = {
|
|||
.of_match_table = of_match_ptr(pic32_sqi_of_ids),
|
||||
},
|
||||
.probe = pic32_sqi_probe,
|
||||
.remove = pic32_sqi_remove,
|
||||
.remove_new = pic32_sqi_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(pic32_sqi_driver);
|
||||
|
|
|
|||
|
|
@ -844,7 +844,7 @@ static int pic32_spi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int pic32_spi_remove(struct platform_device *pdev)
|
||||
static void pic32_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct pic32_spi *pic32s;
|
||||
|
||||
|
|
@ -852,8 +852,6 @@ static int pic32_spi_remove(struct platform_device *pdev)
|
|||
pic32_spi_disable(pic32s);
|
||||
clk_disable_unprepare(pic32s->clk);
|
||||
pic32_spi_dma_unprep(pic32s);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id pic32_spi_of_match[] = {
|
||||
|
|
@ -868,7 +866,7 @@ static struct platform_driver pic32_spi_driver = {
|
|||
.of_match_table = of_match_ptr(pic32_spi_of_match),
|
||||
},
|
||||
.probe = pic32_spi_probe,
|
||||
.remove = pic32_spi_remove,
|
||||
.remove_new = pic32_spi_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(pic32_spi_driver);
|
||||
|
|
|
|||
|
|
@ -464,7 +464,7 @@ static int spi_ppc4xx_of_probe(struct platform_device *op)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int spi_ppc4xx_of_remove(struct platform_device *op)
|
||||
static void spi_ppc4xx_of_remove(struct platform_device *op)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(op);
|
||||
struct ppc4xx_spi *hw = spi_master_get_devdata(master);
|
||||
|
|
@ -474,7 +474,6 @@ static int spi_ppc4xx_of_remove(struct platform_device *op)
|
|||
free_irq(hw->irqnum, hw);
|
||||
iounmap(hw->regs);
|
||||
spi_master_put(master);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id spi_ppc4xx_of_match[] = {
|
||||
|
|
@ -486,7 +485,7 @@ MODULE_DEVICE_TABLE(of, spi_ppc4xx_of_match);
|
|||
|
||||
static struct platform_driver spi_ppc4xx_of_driver = {
|
||||
.probe = spi_ppc4xx_of_probe,
|
||||
.remove = spi_ppc4xx_of_remove,
|
||||
.remove_new = spi_ppc4xx_of_remove,
|
||||
.driver = {
|
||||
.name = DRIVER_NAME,
|
||||
.of_match_table = spi_ppc4xx_of_match,
|
||||
|
|
|
|||
|
|
@ -1659,7 +1659,7 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
|
|||
return status;
|
||||
}
|
||||
|
||||
static int pxa2xx_spi_remove(struct platform_device *pdev)
|
||||
static void pxa2xx_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct driver_data *drv_data = platform_get_drvdata(pdev);
|
||||
struct ssp_device *ssp = drv_data->ssp;
|
||||
|
|
@ -1684,8 +1684,6 @@ static int pxa2xx_spi_remove(struct platform_device *pdev)
|
|||
|
||||
/* Release SSP */
|
||||
pxa_ssp_free(ssp);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int pxa2xx_spi_suspend(struct device *dev)
|
||||
|
|
@ -1770,7 +1768,7 @@ static struct platform_driver driver = {
|
|||
.of_match_table = of_match_ptr(pxa2xx_spi_of_match),
|
||||
},
|
||||
.probe = pxa2xx_spi_probe,
|
||||
.remove = pxa2xx_spi_remove,
|
||||
.remove_new = pxa2xx_spi_remove,
|
||||
};
|
||||
|
||||
static int __init pxa2xx_spi_init(void)
|
||||
|
|
|
|||
|
|
@ -552,7 +552,7 @@ static int qcom_qspi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int qcom_qspi_remove(struct platform_device *pdev)
|
||||
static void qcom_qspi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
|
||||
|
|
@ -560,8 +560,6 @@ static int qcom_qspi_remove(struct platform_device *pdev)
|
|||
spi_unregister_master(master);
|
||||
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __maybe_unused qcom_qspi_runtime_suspend(struct device *dev)
|
||||
|
|
@ -655,7 +653,7 @@ static struct platform_driver qcom_qspi_driver = {
|
|||
.of_match_table = qcom_qspi_dt_match,
|
||||
},
|
||||
.probe = qcom_qspi_probe,
|
||||
.remove = qcom_qspi_remove,
|
||||
.remove_new = qcom_qspi_remove,
|
||||
};
|
||||
module_platform_driver(qcom_qspi_driver);
|
||||
|
||||
|
|
|
|||
|
|
@ -181,13 +181,11 @@ static int rb4xx_spi_probe(struct platform_device *pdev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int rb4xx_spi_remove(struct platform_device *pdev)
|
||||
static void rb4xx_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct rb4xx_spi *rbspi = platform_get_drvdata(pdev);
|
||||
|
||||
clk_disable_unprepare(rbspi->clk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id rb4xx_spi_dt_match[] = {
|
||||
|
|
@ -198,7 +196,7 @@ MODULE_DEVICE_TABLE(of, rb4xx_spi_dt_match);
|
|||
|
||||
static struct platform_driver rb4xx_spi_drv = {
|
||||
.probe = rb4xx_spi_probe,
|
||||
.remove = rb4xx_spi_remove,
|
||||
.remove_new = rb4xx_spi_remove,
|
||||
.driver = {
|
||||
.name = "rb4xx-spi",
|
||||
.of_match_table = of_match_ptr(rb4xx_spi_dt_match),
|
||||
|
|
|
|||
|
|
@ -656,7 +656,7 @@ static int rockchip_sfc_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int rockchip_sfc_remove(struct platform_device *pdev)
|
||||
static void rockchip_sfc_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct rockchip_sfc *sfc = platform_get_drvdata(pdev);
|
||||
|
|
@ -665,8 +665,6 @@ static int rockchip_sfc_remove(struct platform_device *pdev)
|
|||
|
||||
clk_disable_unprepare(sfc->clk);
|
||||
clk_disable_unprepare(sfc->hclk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id rockchip_sfc_dt_ids[] = {
|
||||
|
|
@ -681,7 +679,7 @@ static struct platform_driver rockchip_sfc_driver = {
|
|||
.of_match_table = rockchip_sfc_dt_ids,
|
||||
},
|
||||
.probe = rockchip_sfc_probe,
|
||||
.remove = rockchip_sfc_remove,
|
||||
.remove_new = rockchip_sfc_remove,
|
||||
};
|
||||
module_platform_driver(rockchip_sfc_driver);
|
||||
|
||||
|
|
|
|||
|
|
@ -945,7 +945,7 @@ static int rockchip_spi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int rockchip_spi_remove(struct platform_device *pdev)
|
||||
static void rockchip_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_controller *ctlr = spi_controller_get(platform_get_drvdata(pdev));
|
||||
struct rockchip_spi *rs = spi_controller_get_devdata(ctlr);
|
||||
|
|
@ -965,8 +965,6 @@ static int rockchip_spi_remove(struct platform_device *pdev)
|
|||
dma_release_channel(ctlr->dma_rx);
|
||||
|
||||
spi_controller_put(ctlr);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
|
|
@ -1074,7 +1072,7 @@ static struct platform_driver rockchip_spi_driver = {
|
|||
.of_match_table = of_match_ptr(rockchip_spi_dt_match),
|
||||
},
|
||||
.probe = rockchip_spi_probe,
|
||||
.remove = rockchip_spi_remove,
|
||||
.remove_new = rockchip_spi_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(rockchip_spi_driver);
|
||||
|
|
|
|||
|
|
@ -173,15 +173,13 @@ static int rpcif_spi_probe(struct platform_device *pdev)
|
|||
return error;
|
||||
}
|
||||
|
||||
static int rpcif_spi_remove(struct platform_device *pdev)
|
||||
static void rpcif_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_controller *ctlr = platform_get_drvdata(pdev);
|
||||
struct rpcif *rpc = spi_controller_get_devdata(ctlr);
|
||||
|
||||
spi_unregister_controller(ctlr);
|
||||
pm_runtime_disable(rpc->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __maybe_unused rpcif_spi_suspend(struct device *dev)
|
||||
|
|
@ -202,7 +200,7 @@ static SIMPLE_DEV_PM_OPS(rpcif_spi_pm_ops, rpcif_spi_suspend, rpcif_spi_resume);
|
|||
|
||||
static struct platform_driver rpcif_spi_driver = {
|
||||
.probe = rpcif_spi_probe,
|
||||
.remove = rpcif_spi_remove,
|
||||
.remove_new = rpcif_spi_remove,
|
||||
.driver = {
|
||||
.name = "rpc-if-spi",
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
|
|
|
|||
|
|
@ -1172,14 +1172,12 @@ static void rspi_release_dma(struct spi_controller *ctlr)
|
|||
dma_release_channel(ctlr->dma_rx);
|
||||
}
|
||||
|
||||
static int rspi_remove(struct platform_device *pdev)
|
||||
static void rspi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct rspi_data *rspi = platform_get_drvdata(pdev);
|
||||
|
||||
rspi_release_dma(rspi->ctlr);
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct spi_ops rspi_ops = {
|
||||
|
|
@ -1440,7 +1438,7 @@ static SIMPLE_DEV_PM_OPS(rspi_pm_ops, rspi_suspend, rspi_resume);
|
|||
|
||||
static struct platform_driver rspi_driver = {
|
||||
.probe = rspi_probe,
|
||||
.remove = rspi_remove,
|
||||
.remove_new = rspi_remove,
|
||||
.id_table = spi_driver_ids,
|
||||
.driver = {
|
||||
.name = "renesas_spi",
|
||||
|
|
|
|||
|
|
@ -1286,7 +1286,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int s3c64xx_spi_remove(struct platform_device *pdev)
|
||||
static void s3c64xx_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
|
||||
|
|
@ -1309,8 +1309,6 @@ static int s3c64xx_spi_remove(struct platform_device *pdev)
|
|||
pm_runtime_put_noidle(&pdev->dev);
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
pm_runtime_set_suspended(&pdev->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
|
|
@ -1531,7 +1529,7 @@ static struct platform_driver s3c64xx_spi_driver = {
|
|||
.of_match_table = of_match_ptr(s3c64xx_spi_dt_match),
|
||||
},
|
||||
.probe = s3c64xx_spi_probe,
|
||||
.remove = s3c64xx_spi_remove,
|
||||
.remove_new = s3c64xx_spi_remove,
|
||||
.id_table = s3c64xx_spi_driver_ids,
|
||||
};
|
||||
MODULE_ALIAS("platform:s3c64xx-spi");
|
||||
|
|
|
|||
|
|
@ -276,15 +276,13 @@ static int hspi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int hspi_remove(struct platform_device *pdev)
|
||||
static void hspi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct hspi_priv *hspi = platform_get_drvdata(pdev);
|
||||
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
|
||||
clk_put(hspi->clk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id hspi_of_match[] = {
|
||||
|
|
@ -295,7 +293,7 @@ MODULE_DEVICE_TABLE(of, hspi_of_match);
|
|||
|
||||
static struct platform_driver hspi_driver = {
|
||||
.probe = hspi_probe,
|
||||
.remove = hspi_remove,
|
||||
.remove_new = hspi_remove,
|
||||
.driver = {
|
||||
.name = "sh-hspi",
|
||||
.of_match_table = hspi_of_match,
|
||||
|
|
|
|||
|
|
@ -1375,13 +1375,12 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int sh_msiof_spi_remove(struct platform_device *pdev)
|
||||
static void sh_msiof_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct sh_msiof_spi_priv *p = platform_get_drvdata(pdev);
|
||||
|
||||
sh_msiof_release_dma(p);
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct platform_device_id spi_driver_ids[] = {
|
||||
|
|
@ -1414,7 +1413,7 @@ static SIMPLE_DEV_PM_OPS(sh_msiof_spi_pm_ops, sh_msiof_spi_suspend,
|
|||
|
||||
static struct platform_driver sh_msiof_spi_drv = {
|
||||
.probe = sh_msiof_spi_probe,
|
||||
.remove = sh_msiof_spi_remove,
|
||||
.remove_new = sh_msiof_spi_remove,
|
||||
.id_table = spi_driver_ids,
|
||||
.driver = {
|
||||
.name = "spi_sh_msiof",
|
||||
|
|
|
|||
|
|
@ -171,7 +171,7 @@ static int sh_sci_spi_probe(struct platform_device *dev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int sh_sci_spi_remove(struct platform_device *dev)
|
||||
static void sh_sci_spi_remove(struct platform_device *dev)
|
||||
{
|
||||
struct sh_sci_spi *sp = platform_get_drvdata(dev);
|
||||
|
||||
|
|
@ -179,12 +179,11 @@ static int sh_sci_spi_remove(struct platform_device *dev)
|
|||
setbits(sp, PIN_INIT, 0);
|
||||
iounmap(sp->membase);
|
||||
spi_master_put(sp->bitbang.master);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct platform_driver sh_sci_spi_drv = {
|
||||
.probe = sh_sci_spi_probe,
|
||||
.remove = sh_sci_spi_remove,
|
||||
.remove_new = sh_sci_spi_remove,
|
||||
.driver = {
|
||||
.name = "spi_sh_sci",
|
||||
},
|
||||
|
|
|
|||
|
|
@ -377,14 +377,12 @@ static irqreturn_t spi_sh_irq(int irq, void *_ss)
|
|||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
static int spi_sh_remove(struct platform_device *pdev)
|
||||
static void spi_sh_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_sh_data *ss = platform_get_drvdata(pdev);
|
||||
|
||||
spi_unregister_master(ss->master);
|
||||
free_irq(ss->irq, ss);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int spi_sh_probe(struct platform_device *pdev)
|
||||
|
|
@ -461,7 +459,7 @@ static int spi_sh_probe(struct platform_device *pdev)
|
|||
|
||||
static struct platform_driver spi_sh_driver = {
|
||||
.probe = spi_sh_probe,
|
||||
.remove = spi_sh_remove,
|
||||
.remove_new = spi_sh_remove,
|
||||
.driver = {
|
||||
.name = "sh_spi",
|
||||
},
|
||||
|
|
|
|||
|
|
@ -415,7 +415,7 @@ static int sifive_spi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int sifive_spi_remove(struct platform_device *pdev)
|
||||
static void sifive_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct sifive_spi *spi = spi_master_get_devdata(master);
|
||||
|
|
@ -423,8 +423,6 @@ static int sifive_spi_remove(struct platform_device *pdev)
|
|||
/* Disable all the interrupts just in case */
|
||||
sifive_spi_write(spi, SIFIVE_SPI_REG_IE, 0);
|
||||
clk_disable_unprepare(spi->clk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sifive_spi_suspend(struct device *dev)
|
||||
|
|
@ -473,7 +471,7 @@ MODULE_DEVICE_TABLE(of, sifive_spi_of_match);
|
|||
|
||||
static struct platform_driver sifive_spi_driver = {
|
||||
.probe = sifive_spi_probe,
|
||||
.remove = sifive_spi_remove,
|
||||
.remove_new = sifive_spi_remove,
|
||||
.driver = {
|
||||
.name = SIFIVE_SPI_DRIVER_NAME,
|
||||
.pm = &sifive_spi_pm_ops,
|
||||
|
|
|
|||
|
|
@ -474,11 +474,9 @@ static int mtk_spi_slave_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int mtk_spi_slave_remove(struct platform_device *pdev)
|
||||
static void mtk_spi_slave_remove(struct platform_device *pdev)
|
||||
{
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
|
|
@ -560,7 +558,7 @@ static struct platform_driver mtk_spi_slave_driver = {
|
|||
.of_match_table = mtk_spi_slave_of_match,
|
||||
},
|
||||
.probe = mtk_spi_slave_probe,
|
||||
.remove = mtk_spi_slave_remove,
|
||||
.remove_new = mtk_spi_slave_remove,
|
||||
};
|
||||
|
||||
module_platform_driver(mtk_spi_slave_driver);
|
||||
|
|
|
|||
|
|
@ -670,15 +670,13 @@ static int f_ospi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int f_ospi_remove(struct platform_device *pdev)
|
||||
static void f_ospi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct f_ospi *ospi = platform_get_drvdata(pdev);
|
||||
|
||||
clk_disable_unprepare(ospi->clk);
|
||||
|
||||
mutex_destroy(&ospi->mlock);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id f_ospi_dt_ids[] = {
|
||||
|
|
@ -693,7 +691,7 @@ static struct platform_driver f_ospi_driver = {
|
|||
.of_match_table = f_ospi_dt_ids,
|
||||
},
|
||||
.probe = f_ospi_probe,
|
||||
.remove = f_ospi_remove,
|
||||
.remove_new = f_ospi_remove,
|
||||
};
|
||||
module_platform_driver(f_ospi_driver);
|
||||
|
||||
|
|
|
|||
|
|
@ -608,13 +608,12 @@ static int sprd_adi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int sprd_adi_remove(struct platform_device *pdev)
|
||||
static void sprd_adi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_controller *ctlr = dev_get_drvdata(&pdev->dev);
|
||||
struct sprd_adi *sadi = spi_controller_get_devdata(ctlr);
|
||||
|
||||
unregister_restart_handler(&sadi->restart_handler);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct sprd_adi_data sc9860_data = {
|
||||
|
|
@ -660,7 +659,7 @@ static struct platform_driver sprd_adi_driver = {
|
|||
.of_match_table = sprd_adi_of_match,
|
||||
},
|
||||
.probe = sprd_adi_probe,
|
||||
.remove = sprd_adi_remove,
|
||||
.remove_new = sprd_adi_remove,
|
||||
};
|
||||
module_platform_driver(sprd_adi_driver);
|
||||
|
||||
|
|
|
|||
|
|
@ -366,7 +366,7 @@ static int spi_st_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int spi_st_remove(struct platform_device *pdev)
|
||||
static void spi_st_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct spi_st *spi_st = spi_master_get_devdata(master);
|
||||
|
|
@ -376,8 +376,6 @@ static int spi_st_remove(struct platform_device *pdev)
|
|||
clk_disable_unprepare(spi_st->clk);
|
||||
|
||||
pinctrl_pm_select_sleep_state(&pdev->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
|
|
@ -451,7 +449,7 @@ static struct platform_driver spi_st_driver = {
|
|||
.of_match_table = of_match_ptr(stm_spi_match),
|
||||
},
|
||||
.probe = spi_st_probe,
|
||||
.remove = spi_st_remove,
|
||||
.remove_new = spi_st_remove,
|
||||
};
|
||||
module_platform_driver(spi_st_driver);
|
||||
|
||||
|
|
|
|||
|
|
@ -888,7 +888,7 @@ static int stm32_qspi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int stm32_qspi_remove(struct platform_device *pdev)
|
||||
static void stm32_qspi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct stm32_qspi *qspi = platform_get_drvdata(pdev);
|
||||
|
||||
|
|
@ -903,8 +903,6 @@ static int stm32_qspi_remove(struct platform_device *pdev)
|
|||
pm_runtime_set_suspended(qspi->dev);
|
||||
pm_runtime_dont_use_autosuspend(qspi->dev);
|
||||
clk_disable_unprepare(qspi->clk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __maybe_unused stm32_qspi_runtime_suspend(struct device *dev)
|
||||
|
|
@ -968,7 +966,7 @@ MODULE_DEVICE_TABLE(of, stm32_qspi_match);
|
|||
|
||||
static struct platform_driver stm32_qspi_driver = {
|
||||
.probe = stm32_qspi_probe,
|
||||
.remove = stm32_qspi_remove,
|
||||
.remove_new = stm32_qspi_remove,
|
||||
.driver = {
|
||||
.name = "stm32-qspi",
|
||||
.of_match_table = stm32_qspi_match,
|
||||
|
|
|
|||
|
|
@ -1922,7 +1922,7 @@ static int stm32_spi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int stm32_spi_remove(struct platform_device *pdev)
|
||||
static void stm32_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct stm32_spi *spi = spi_master_get_devdata(master);
|
||||
|
|
@ -1946,8 +1946,6 @@ static int stm32_spi_remove(struct platform_device *pdev)
|
|||
|
||||
|
||||
pinctrl_pm_select_sleep_state(&pdev->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __maybe_unused stm32_spi_runtime_suspend(struct device *dev)
|
||||
|
|
@ -2023,7 +2021,7 @@ static const struct dev_pm_ops stm32_spi_pm_ops = {
|
|||
|
||||
static struct platform_driver stm32_spi_driver = {
|
||||
.probe = stm32_spi_probe,
|
||||
.remove = stm32_spi_remove,
|
||||
.remove_new = stm32_spi_remove,
|
||||
.driver = {
|
||||
.name = DRIVER_NAME,
|
||||
.pm = &stm32_spi_pm_ops,
|
||||
|
|
|
|||
|
|
@ -516,11 +516,9 @@ static int sun4i_spi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int sun4i_spi_remove(struct platform_device *pdev)
|
||||
static void sun4i_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
pm_runtime_force_suspend(&pdev->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id sun4i_spi_match[] = {
|
||||
|
|
@ -536,7 +534,7 @@ static const struct dev_pm_ops sun4i_spi_pm_ops = {
|
|||
|
||||
static struct platform_driver sun4i_spi_driver = {
|
||||
.probe = sun4i_spi_probe,
|
||||
.remove = sun4i_spi_remove,
|
||||
.remove_new = sun4i_spi_remove,
|
||||
.driver = {
|
||||
.name = "sun4i-spi",
|
||||
.of_match_table = sun4i_spi_match,
|
||||
|
|
|
|||
|
|
@ -683,7 +683,7 @@ static int sun6i_spi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int sun6i_spi_remove(struct platform_device *pdev)
|
||||
static void sun6i_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
|
||||
|
|
@ -693,7 +693,6 @@ static int sun6i_spi_remove(struct platform_device *pdev)
|
|||
dma_release_channel(master->dma_tx);
|
||||
if (master->dma_rx)
|
||||
dma_release_channel(master->dma_rx);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id sun6i_spi_match[] = {
|
||||
|
|
@ -710,7 +709,7 @@ static const struct dev_pm_ops sun6i_spi_pm_ops = {
|
|||
|
||||
static struct platform_driver sun6i_spi_driver = {
|
||||
.probe = sun6i_spi_probe,
|
||||
.remove = sun6i_spi_remove,
|
||||
.remove_new = sun6i_spi_remove,
|
||||
.driver = {
|
||||
.name = "sun6i-spi",
|
||||
.of_match_table = sun6i_spi_match,
|
||||
|
|
|
|||
|
|
@ -504,14 +504,13 @@ static int sp7021_spi_controller_probe(struct platform_device *pdev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int sp7021_spi_controller_remove(struct platform_device *pdev)
|
||||
static void sp7021_spi_controller_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_controller *ctlr = dev_get_drvdata(&pdev->dev);
|
||||
|
||||
spi_unregister_controller(ctlr);
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
pm_runtime_set_suspended(&pdev->dev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __maybe_unused sp7021_spi_controller_suspend(struct device *dev)
|
||||
|
|
@ -564,7 +563,7 @@ MODULE_DEVICE_TABLE(of, sp7021_spi_controller_ids);
|
|||
|
||||
static struct platform_driver sp7021_spi_controller_driver = {
|
||||
.probe = sp7021_spi_controller_probe,
|
||||
.remove = sp7021_spi_controller_remove,
|
||||
.remove_new = sp7021_spi_controller_remove,
|
||||
.driver = {
|
||||
.name = "sunplus,sp7021-spi-controller",
|
||||
.of_match_table = sp7021_spi_controller_ids,
|
||||
|
|
|
|||
|
|
@ -735,7 +735,7 @@ static int synquacer_spi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int synquacer_spi_remove(struct platform_device *pdev)
|
||||
static void synquacer_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct synquacer_spi *sspi = spi_master_get_devdata(master);
|
||||
|
|
@ -743,8 +743,6 @@ static int synquacer_spi_remove(struct platform_device *pdev)
|
|||
pm_runtime_disable(sspi->dev);
|
||||
|
||||
clk_disable_unprepare(sspi->clk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __maybe_unused synquacer_spi_suspend(struct device *dev)
|
||||
|
|
@ -820,7 +818,7 @@ static struct platform_driver synquacer_spi_driver = {
|
|||
.acpi_match_table = ACPI_PTR(synquacer_hsspi_acpi_ids),
|
||||
},
|
||||
.probe = synquacer_spi_probe,
|
||||
.remove = synquacer_spi_remove,
|
||||
.remove_new = synquacer_spi_remove,
|
||||
};
|
||||
module_platform_driver(synquacer_spi_driver);
|
||||
|
||||
|
|
|
|||
|
|
@ -1440,7 +1440,7 @@ static int tegra_spi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int tegra_spi_remove(struct platform_device *pdev)
|
||||
static void tegra_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct tegra_spi_data *tspi = spi_master_get_devdata(master);
|
||||
|
|
@ -1456,8 +1456,6 @@ static int tegra_spi_remove(struct platform_device *pdev)
|
|||
pm_runtime_disable(&pdev->dev);
|
||||
if (!pm_runtime_status_suspended(&pdev->dev))
|
||||
tegra_spi_runtime_suspend(&pdev->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
|
|
@ -1526,7 +1524,7 @@ static struct platform_driver tegra_spi_driver = {
|
|||
.of_match_table = tegra_spi_of_match,
|
||||
},
|
||||
.probe = tegra_spi_probe,
|
||||
.remove = tegra_spi_remove,
|
||||
.remove_new = tegra_spi_remove,
|
||||
};
|
||||
module_platform_driver(tegra_spi_driver);
|
||||
|
||||
|
|
|
|||
|
|
@ -520,7 +520,7 @@ static int tegra_sflash_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int tegra_sflash_remove(struct platform_device *pdev)
|
||||
static void tegra_sflash_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct tegra_sflash_data *tsd = spi_master_get_devdata(master);
|
||||
|
|
@ -530,8 +530,6 @@ static int tegra_sflash_remove(struct platform_device *pdev)
|
|||
pm_runtime_disable(&pdev->dev);
|
||||
if (!pm_runtime_status_suspended(&pdev->dev))
|
||||
tegra_sflash_runtime_suspend(&pdev->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
|
|
@ -598,7 +596,7 @@ static struct platform_driver tegra_sflash_driver = {
|
|||
.of_match_table = tegra_sflash_of_match,
|
||||
},
|
||||
.probe = tegra_sflash_probe,
|
||||
.remove = tegra_sflash_remove,
|
||||
.remove_new = tegra_sflash_remove,
|
||||
};
|
||||
module_platform_driver(tegra_sflash_driver);
|
||||
|
||||
|
|
|
|||
|
|
@ -1134,7 +1134,7 @@ static int tegra_slink_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int tegra_slink_remove(struct platform_device *pdev)
|
||||
static void tegra_slink_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = spi_master_get(platform_get_drvdata(pdev));
|
||||
struct tegra_slink_data *tspi = spi_master_get_devdata(master);
|
||||
|
|
@ -1152,7 +1152,6 @@ static int tegra_slink_remove(struct platform_device *pdev)
|
|||
tegra_slink_deinit_dma_param(tspi, true);
|
||||
|
||||
spi_master_put(master);
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PM_SLEEP
|
||||
|
|
@ -1220,7 +1219,7 @@ static struct platform_driver tegra_slink_driver = {
|
|||
.of_match_table = tegra_slink_of_match,
|
||||
},
|
||||
.probe = tegra_slink_probe,
|
||||
.remove = tegra_slink_remove,
|
||||
.remove_new = tegra_slink_remove,
|
||||
};
|
||||
module_platform_driver(tegra_slink_driver);
|
||||
|
||||
|
|
|
|||
|
|
@ -1630,7 +1630,7 @@ static int tegra_qspi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int tegra_qspi_remove(struct platform_device *pdev)
|
||||
static void tegra_qspi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct tegra_qspi *tqspi = spi_master_get_devdata(master);
|
||||
|
|
@ -1639,8 +1639,6 @@ static int tegra_qspi_remove(struct platform_device *pdev)
|
|||
free_irq(tqspi->irq, tqspi);
|
||||
pm_runtime_force_suspend(&pdev->dev);
|
||||
tegra_qspi_deinit_dma(tqspi);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __maybe_unused tegra_qspi_suspend(struct device *dev)
|
||||
|
|
@ -1714,7 +1712,7 @@ static struct platform_driver tegra_qspi_driver = {
|
|||
.acpi_match_table = ACPI_PTR(tegra_qspi_acpi_match),
|
||||
},
|
||||
.probe = tegra_qspi_probe,
|
||||
.remove = tegra_qspi_remove,
|
||||
.remove_new = tegra_qspi_remove,
|
||||
};
|
||||
module_platform_driver(tegra_qspi_driver);
|
||||
|
||||
|
|
|
|||
|
|
@ -1396,7 +1396,7 @@ static int pch_spi_pd_probe(struct platform_device *plat_dev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int pch_spi_pd_remove(struct platform_device *plat_dev)
|
||||
static void pch_spi_pd_remove(struct platform_device *plat_dev)
|
||||
{
|
||||
struct pch_spi_board_data *board_dat = dev_get_platdata(&plat_dev->dev);
|
||||
struct pch_spi_data *data = platform_get_drvdata(plat_dev);
|
||||
|
|
@ -1434,8 +1434,6 @@ static int pch_spi_pd_remove(struct platform_device *plat_dev)
|
|||
|
||||
pci_iounmap(board_dat->pdev, data->io_remap_addr);
|
||||
spi_unregister_master(data->master);
|
||||
|
||||
return 0;
|
||||
}
|
||||
#ifdef CONFIG_PM
|
||||
static int pch_spi_pd_suspend(struct platform_device *pd_dev,
|
||||
|
|
@ -1516,7 +1514,7 @@ static struct platform_driver pch_spi_pd_driver = {
|
|||
.name = "pch-spi",
|
||||
},
|
||||
.probe = pch_spi_pd_probe,
|
||||
.remove = pch_spi_pd_remove,
|
||||
.remove_new = pch_spi_pd_remove,
|
||||
.suspend = pch_spi_pd_suspend,
|
||||
.resume = pch_spi_pd_resume
|
||||
};
|
||||
|
|
|
|||
|
|
@ -775,7 +775,7 @@ static int uniphier_spi_probe(struct platform_device *pdev)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int uniphier_spi_remove(struct platform_device *pdev)
|
||||
static void uniphier_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct uniphier_spi_priv *priv = spi_master_get_devdata(master);
|
||||
|
|
@ -786,8 +786,6 @@ static int uniphier_spi_remove(struct platform_device *pdev)
|
|||
dma_release_channel(master->dma_rx);
|
||||
|
||||
clk_disable_unprepare(priv->clk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id uniphier_spi_match[] = {
|
||||
|
|
@ -798,7 +796,7 @@ MODULE_DEVICE_TABLE(of, uniphier_spi_match);
|
|||
|
||||
static struct platform_driver uniphier_spi_driver = {
|
||||
.probe = uniphier_spi_probe,
|
||||
.remove = uniphier_spi_remove,
|
||||
.remove_new = uniphier_spi_remove,
|
||||
.driver = {
|
||||
.name = "uniphier-spi",
|
||||
.of_match_table = uniphier_spi_match,
|
||||
|
|
|
|||
|
|
@ -504,7 +504,7 @@ static int xilinx_spi_probe(struct platform_device *pdev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int xilinx_spi_remove(struct platform_device *pdev)
|
||||
static void xilinx_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct xilinx_spi *xspi = spi_master_get_devdata(master);
|
||||
|
|
@ -518,8 +518,6 @@ static int xilinx_spi_remove(struct platform_device *pdev)
|
|||
xspi->write_fn(0, regs_base + XIPIF_V123B_DGIER_OFFSET);
|
||||
|
||||
spi_master_put(xspi->bitbang.master);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* work with hotplug and coldplug */
|
||||
|
|
@ -527,7 +525,7 @@ MODULE_ALIAS("platform:" XILINX_SPI_NAME);
|
|||
|
||||
static struct platform_driver xilinx_spi_driver = {
|
||||
.probe = xilinx_spi_probe,
|
||||
.remove = xilinx_spi_remove,
|
||||
.remove_new = xilinx_spi_remove,
|
||||
.driver = {
|
||||
.name = XILINX_SPI_NAME,
|
||||
.of_match_table = xilinx_spi_of_match,
|
||||
|
|
|
|||
|
|
@ -117,15 +117,13 @@ static int xtfpga_spi_probe(struct platform_device *pdev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int xtfpga_spi_remove(struct platform_device *pdev)
|
||||
static void xtfpga_spi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct spi_master *master = platform_get_drvdata(pdev);
|
||||
struct xtfpga_spi *xspi = spi_master_get_devdata(master);
|
||||
|
||||
spi_bitbang_stop(&xspi->bitbang);
|
||||
spi_master_put(master);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
MODULE_ALIAS("platform:" XTFPGA_SPI_NAME);
|
||||
|
|
@ -140,7 +138,7 @@ MODULE_DEVICE_TABLE(of, xtfpga_spi_of_match);
|
|||
|
||||
static struct platform_driver xtfpga_spi_driver = {
|
||||
.probe = xtfpga_spi_probe,
|
||||
.remove = xtfpga_spi_remove,
|
||||
.remove_new = xtfpga_spi_remove,
|
||||
.driver = {
|
||||
.name = XTFPGA_SPI_NAME,
|
||||
.of_match_table = of_match_ptr(xtfpga_spi_of_match),
|
||||
|
|
|
|||
|
|
@ -741,7 +741,7 @@ static int zynq_qspi_probe(struct platform_device *pdev)
|
|||
*
|
||||
* Return: 0 on success and error value on failure
|
||||
*/
|
||||
static int zynq_qspi_remove(struct platform_device *pdev)
|
||||
static void zynq_qspi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct zynq_qspi *xqspi = platform_get_drvdata(pdev);
|
||||
|
||||
|
|
@ -749,8 +749,6 @@ static int zynq_qspi_remove(struct platform_device *pdev)
|
|||
|
||||
clk_disable_unprepare(xqspi->refclk);
|
||||
clk_disable_unprepare(xqspi->pclk);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id zynq_qspi_of_match[] = {
|
||||
|
|
@ -765,7 +763,7 @@ MODULE_DEVICE_TABLE(of, zynq_qspi_of_match);
|
|||
*/
|
||||
static struct platform_driver zynq_qspi_driver = {
|
||||
.probe = zynq_qspi_probe,
|
||||
.remove = zynq_qspi_remove,
|
||||
.remove_new = zynq_qspi_remove,
|
||||
.driver = {
|
||||
.name = "zynq-qspi",
|
||||
.of_match_table = zynq_qspi_of_match,
|
||||
|
|
|
|||
|
|
@ -1364,7 +1364,7 @@ static int zynqmp_qspi_probe(struct platform_device *pdev)
|
|||
*
|
||||
* Return: 0 Always
|
||||
*/
|
||||
static int zynqmp_qspi_remove(struct platform_device *pdev)
|
||||
static void zynqmp_qspi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct zynqmp_qspi *xqspi = platform_get_drvdata(pdev);
|
||||
|
||||
|
|
@ -1373,15 +1373,13 @@ static int zynqmp_qspi_remove(struct platform_device *pdev)
|
|||
clk_disable_unprepare(xqspi->pclk);
|
||||
pm_runtime_set_suspended(&pdev->dev);
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
MODULE_DEVICE_TABLE(of, zynqmp_qspi_of_match);
|
||||
|
||||
static struct platform_driver zynqmp_qspi_driver = {
|
||||
.probe = zynqmp_qspi_probe,
|
||||
.remove = zynqmp_qspi_remove,
|
||||
.remove_new = zynqmp_qspi_remove,
|
||||
.driver = {
|
||||
.name = "zynqmp-qspi",
|
||||
.of_match_table = zynqmp_qspi_of_match,
|
||||
|
|
|
|||
Loading…
Reference in a new issue