Skip to content

Commit

Permalink
amba: Make the remove callback return void
Browse files Browse the repository at this point in the history 
All amba drivers return 0 in their remove callback. Together with the
driver core ignoring the return value anyhow, it doesn't make sense to
return a value here.

Change the remove prototype to return void, which makes it explicit that
returning an error value doesn't work as expected. This simplifies changing
the core remove callback to return void, too.

Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Acked-by: Krzysztof Kozlowski <krzk@kernel.org> # for drivers/memory
Acked-by: Mark Brown <broonie@kernel.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Suzuki K Poulose <suzuki.poulose@arm.com> # for hwtracing/coresight
Acked-By: Vinod Koul <vkoul@kernel.org> # for dmaengine
Acked-by: Guenter Roeck <linux@roeck-us.net> # for watchdog
Acked-by: Wolfram Sang <wsa@kernel.org> # for I2C
Acked-by: Takashi Iwai <tiwai@suse.de> # for sound
Acked-by: Vladimir Zapolskiy <vz@mleia.com> # for memory/pl172
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20210126165835.687514-5-u.kleine-koenig@pengutronix.de
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
  • Loading branch information
Uwe Kleine-König authored and Uwe Kleine-König committed Feb 2, 2021
1 parent 5b495ac commit 3fd269e
Show file tree
Hide file tree
Showing 30 changed files with 34 additions and 80 deletions.
5 changes: 2 additions & 3 deletions drivers/amba/bus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,11 +300,10 @@ static int amba_remove(struct device *dev)
{
struct amba_device *pcdev = to_amba_device(dev);
struct amba_driver *drv = to_amba_driver(dev->driver);
int ret = 0;

pm_runtime_get_sync(dev);
if (drv->remove)
ret = drv->remove(pcdev);
drv->remove(pcdev);
pm_runtime_put_noidle(dev);

/* Undo the runtime PM settings in amba_probe() */
Expand All @@ -315,7 +314,7 @@ static int amba_remove(struct device *dev)
amba_put_disable_pclk(pcdev);
dev_pm_domain_detach(dev, true);

return ret;
return 0;
}

static void amba_shutdown(struct device *dev)
Expand Down
3 changes: 1 addition & 2 deletions drivers/char/hw_random/nomadik-rng.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,10 @@ static int nmk_rng_probe(struct amba_device *dev, const struct amba_id *id)
return ret;
}

static int nmk_rng_remove(struct amba_device *dev)
static void nmk_rng_remove(struct amba_device *dev)
{
amba_release_regions(dev);
clk_disable(rng_clk);
return 0;
}

static const struct amba_id nmk_rng_ids[] = {
Expand Down
3 changes: 1 addition & 2 deletions drivers/dma/pl330.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3195,7 +3195,7 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
return ret;
}

static int pl330_remove(struct amba_device *adev)
static void pl330_remove(struct amba_device *adev)
{
struct pl330_dmac *pl330 = amba_get_drvdata(adev);
struct dma_pl330_chan *pch, *_p;
Expand Down Expand Up @@ -3235,7 +3235,6 @@ static int pl330_remove(struct amba_device *adev)

if (pl330->rstc)
reset_control_assert(pl330->rstc);
return 0;
}

static const struct amba_id pl330_ids[] = {
Expand Down
4 changes: 1 addition & 3 deletions drivers/gpu/drm/pl111/pl111_drv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ static int pl111_amba_probe(struct amba_device *amba_dev,
return ret;
}

static int pl111_amba_remove(struct amba_device *amba_dev)
static void pl111_amba_remove(struct amba_device *amba_dev)
{
struct device *dev = &amba_dev->dev;
struct drm_device *drm = amba_get_drvdata(amba_dev);
Expand All @@ -331,8 +331,6 @@ static int pl111_amba_remove(struct amba_device *amba_dev)
drm_panel_bridge_remove(priv->bridge);
drm_dev_put(drm);
of_reserved_mem_device_release(dev);

return 0;
}

/*
Expand Down
3 changes: 1 addition & 2 deletions drivers/hwtracing/coresight/coresight-catu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -567,12 +567,11 @@ static int catu_probe(struct amba_device *adev, const struct amba_id *id)
return ret;
}

static int catu_remove(struct amba_device *adev)
static void catu_remove(struct amba_device *adev)
{
struct catu_drvdata *drvdata = dev_get_drvdata(&adev->dev);

coresight_unregister(drvdata->csdev);
return 0;
}

static struct amba_id catu_ids[] = {
Expand Down
4 changes: 1 addition & 3 deletions drivers/hwtracing/coresight/coresight-cpu-debug.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ static int debug_probe(struct amba_device *adev, const struct amba_id *id)
return ret;
}

static int debug_remove(struct amba_device *adev)
static void debug_remove(struct amba_device *adev)
{
struct device *dev = &adev->dev;
struct debug_drvdata *drvdata = amba_get_drvdata(adev);
Expand All @@ -642,8 +642,6 @@ static int debug_remove(struct amba_device *adev)

if (!--debug_count)
debug_func_exit();

return 0;
}

static const struct amba_cs_uci_id uci_id_debug[] = {
Expand Down
4 changes: 1 addition & 3 deletions drivers/hwtracing/coresight/coresight-cti-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,7 @@ static void cti_device_release(struct device *dev)
if (drvdata->csdev_release)
drvdata->csdev_release(dev);
}
static int cti_remove(struct amba_device *adev)
static void cti_remove(struct amba_device *adev)
{
struct cti_drvdata *drvdata = dev_get_drvdata(&adev->dev);

Expand All @@ -845,8 +845,6 @@ static int cti_remove(struct amba_device *adev)
mutex_unlock(&ect_mutex);

coresight_unregister(drvdata->csdev);

return 0;
}

static int cti_probe(struct amba_device *adev, const struct amba_id *id)
Expand Down
4 changes: 1 addition & 3 deletions drivers/hwtracing/coresight/coresight-etb10.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,7 @@ static int etb_probe(struct amba_device *adev, const struct amba_id *id)
return ret;
}

static int etb_remove(struct amba_device *adev)
static void etb_remove(struct amba_device *adev)
{
struct etb_drvdata *drvdata = dev_get_drvdata(&adev->dev);

Expand All @@ -814,8 +814,6 @@ static int etb_remove(struct amba_device *adev)
*/
misc_deregister(&drvdata->miscdev);
coresight_unregister(drvdata->csdev);

return 0;
}

#ifdef CONFIG_PM
Expand Down
4 changes: 1 addition & 3 deletions drivers/hwtracing/coresight/coresight-etm3x-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -909,7 +909,7 @@ static void clear_etmdrvdata(void *info)
etmdrvdata[cpu] = NULL;
}

static int etm_remove(struct amba_device *adev)
static void etm_remove(struct amba_device *adev)
{
struct etm_drvdata *drvdata = dev_get_drvdata(&adev->dev);

Expand All @@ -932,8 +932,6 @@ static int etm_remove(struct amba_device *adev)
cpus_read_unlock();

coresight_unregister(drvdata->csdev);

return 0;
}

#ifdef CONFIG_PM
Expand Down
4 changes: 1 addition & 3 deletions drivers/hwtracing/coresight/coresight-etm4x-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1680,7 +1680,7 @@ static void clear_etmdrvdata(void *info)
etmdrvdata[cpu] = NULL;
}

static int etm4_remove(struct amba_device *adev)
static void etm4_remove(struct amba_device *adev)
{
struct etmv4_drvdata *drvdata = dev_get_drvdata(&adev->dev);

Expand All @@ -1703,8 +1703,6 @@ static int etm4_remove(struct amba_device *adev)
cpus_read_unlock();

coresight_unregister(drvdata->csdev);

return 0;
}

static const struct amba_id etm4_ids[] = {
Expand Down
4 changes: 2 additions & 2 deletions drivers/hwtracing/coresight/coresight-funnel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -370,9 +370,9 @@ static int dynamic_funnel_probe(struct amba_device *adev,
return funnel_probe(&adev->dev, &adev->res);
}

static int dynamic_funnel_remove(struct amba_device *adev)
static void dynamic_funnel_remove(struct amba_device *adev)
{
return funnel_remove(&adev->dev);
funnel_remove(&adev->dev);
}

static const struct amba_id dynamic_funnel_ids[] = {
Expand Down
4 changes: 2 additions & 2 deletions drivers/hwtracing/coresight/coresight-replicator.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,9 +388,9 @@ static int dynamic_replicator_probe(struct amba_device *adev,
return replicator_probe(&adev->dev, &adev->res);
}

static int dynamic_replicator_remove(struct amba_device *adev)
static void dynamic_replicator_remove(struct amba_device *adev)
{
return replicator_remove(&adev->dev);
replicator_remove(&adev->dev);
}

static const struct amba_id dynamic_replicator_ids[] = {
Expand Down
4 changes: 1 addition & 3 deletions drivers/hwtracing/coresight/coresight-stm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -951,15 +951,13 @@ static int stm_probe(struct amba_device *adev, const struct amba_id *id)
return ret;
}

static int stm_remove(struct amba_device *adev)
static void stm_remove(struct amba_device *adev)
{
struct stm_drvdata *drvdata = dev_get_drvdata(&adev->dev);

coresight_unregister(drvdata->csdev);

stm_unregister_device(&drvdata->stm);

return 0;
}

#ifdef CONFIG_PM
Expand Down
4 changes: 1 addition & 3 deletions drivers/hwtracing/coresight/coresight-tmc-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ static void tmc_shutdown(struct amba_device *adev)
spin_unlock_irqrestore(&drvdata->spinlock, flags);
}

static int tmc_remove(struct amba_device *adev)
static void tmc_remove(struct amba_device *adev)
{
struct tmc_drvdata *drvdata = dev_get_drvdata(&adev->dev);

Expand All @@ -570,8 +570,6 @@ static int tmc_remove(struct amba_device *adev)
*/
misc_deregister(&drvdata->miscdev);
coresight_unregister(drvdata->csdev);

return 0;
}

static const struct amba_id tmc_ids[] = {
Expand Down
4 changes: 1 addition & 3 deletions drivers/hwtracing/coresight/coresight-tpiu.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,11 @@ static int tpiu_probe(struct amba_device *adev, const struct amba_id *id)
return PTR_ERR(drvdata->csdev);
}

static int tpiu_remove(struct amba_device *adev)
static void tpiu_remove(struct amba_device *adev)
{
struct tpiu_drvdata *drvdata = dev_get_drvdata(&adev->dev);

coresight_unregister(drvdata->csdev);

return 0;
}

#ifdef CONFIG_PM
Expand Down
4 changes: 1 addition & 3 deletions drivers/i2c/busses/i2c-nomadik.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1055,7 +1055,7 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)
return ret;
}

static int nmk_i2c_remove(struct amba_device *adev)
static void nmk_i2c_remove(struct amba_device *adev)
{
struct resource *res = &adev->res;
struct nmk_i2c_dev *dev = amba_get_drvdata(adev);
Expand All @@ -1068,8 +1068,6 @@ static int nmk_i2c_remove(struct amba_device *adev)
i2c_clr_bit(dev->virtbase + I2C_CR, I2C_CR_PE);
clk_disable_unprepare(dev->clk);
release_mem_region(res->start, resource_size(res));

return 0;
}

static struct i2c_vendor_data vendor_stn8815 = {
Expand Down
3 changes: 1 addition & 2 deletions drivers/input/serio/ambakmi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ static int amba_kmi_probe(struct amba_device *dev,
return ret;
}

static int amba_kmi_remove(struct amba_device *dev)
static void amba_kmi_remove(struct amba_device *dev)
{
struct amba_kmi_port *kmi = amba_get_drvdata(dev);

Expand All @@ -168,7 +168,6 @@ static int amba_kmi_remove(struct amba_device *dev)
iounmap(kmi->base);
kfree(kmi);
amba_release_regions(dev);
return 0;
}

static int __maybe_unused amba_kmi_resume(struct device *dev)
Expand Down
4 changes: 1 addition & 3 deletions drivers/memory/pl172.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,14 +273,12 @@ static int pl172_probe(struct amba_device *adev, const struct amba_id *id)
return ret;
}

static int pl172_remove(struct amba_device *adev)
static void pl172_remove(struct amba_device *adev)
{
struct pl172_data *pl172 = amba_get_drvdata(adev);

clk_disable_unprepare(pl172->clk);
amba_release_regions(adev);

return 0;
}

static const struct amba_id pl172_ids[] = {
Expand Down
4 changes: 1 addition & 3 deletions drivers/memory/pl353-smc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,14 +426,12 @@ static int pl353_smc_probe(struct amba_device *adev, const struct amba_id *id)
return err;
}

static int pl353_smc_remove(struct amba_device *adev)
static void pl353_smc_remove(struct amba_device *adev)
{
struct pl353_smc_data *pl353_smc = amba_get_drvdata(adev);

clk_disable_unprepare(pl353_smc->memclk);
clk_disable_unprepare(pl353_smc->aclk);

return 0;
}

static const struct amba_id pl353_ids[] = {
Expand Down
4 changes: 1 addition & 3 deletions drivers/mmc/host/mmci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2195,7 +2195,7 @@ static int mmci_probe(struct amba_device *dev,
return ret;
}

static int mmci_remove(struct amba_device *dev)
static void mmci_remove(struct amba_device *dev)
{
struct mmc_host *mmc = amba_get_drvdata(dev);

Expand Down Expand Up @@ -2223,8 +2223,6 @@ static int mmci_remove(struct amba_device *dev)
clk_disable_unprepare(host->clk);
mmc_free_host(mmc);
}

return 0;
}

#ifdef CONFIG_PM
Expand Down
4 changes: 1 addition & 3 deletions drivers/rtc/rtc-pl030.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ static int pl030_probe(struct amba_device *dev, const struct amba_id *id)
return ret;
}

static int pl030_remove(struct amba_device *dev)
static void pl030_remove(struct amba_device *dev)
{
struct pl030_rtc *rtc = amba_get_drvdata(dev);

Expand All @@ -146,8 +146,6 @@ static int pl030_remove(struct amba_device *dev)
free_irq(dev->irq[0], rtc);
iounmap(rtc->base);
amba_release_regions(dev);

return 0;
}

static struct amba_id pl030_ids[] = {
Expand Down
4 changes: 1 addition & 3 deletions drivers/rtc/rtc-pl031.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ static int pl031_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
return 0;
}

static int pl031_remove(struct amba_device *adev)
static void pl031_remove(struct amba_device *adev)
{
struct pl031_local *ldata = dev_get_drvdata(&adev->dev);

Expand All @@ -289,8 +289,6 @@ static int pl031_remove(struct amba_device *adev)
if (adev->irq[0])
free_irq(adev->irq[0], ldata);
amba_release_regions(adev);

return 0;
}

static int pl031_probe(struct amba_device *adev, const struct amba_id *id)
Expand Down
5 changes: 2 additions & 3 deletions drivers/spi/spi-pl022.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2314,13 +2314,13 @@ static int pl022_probe(struct amba_device *adev, const struct amba_id *id)
return status;
}

static int
static void
pl022_remove(struct amba_device *adev)
{
struct pl022 *pl022 = amba_get_drvdata(adev);

if (!pl022)
return 0;
return;

/*
* undo pm_runtime_put() in probe. I assume that we're not
Expand All @@ -2335,7 +2335,6 @@ pl022_remove(struct amba_device *adev)
clk_disable_unprepare(pl022->clk);
amba_release_regions(adev);
tasklet_disable(&pl022->pump_transfers);
return 0;
}

#ifdef CONFIG_PM_SLEEP
Expand Down
Loading

0 comments on commit 3fd269e

Please sign in to comment.