diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-02-05 11:15:43 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-02-05 11:15:43 +0100 |
| commit | 0573d3fa48640f0fa6b105ff92dcb02b94d6c1ab (patch) | |
| tree | 9ec7ef79856a7aff2d4230adcaa9073d20919afb /drivers/memory | |
| parent | Merge tag 'icc-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dja... (diff) | |
| parent | ARM: 9055/1: mailbox: arm_mhuv2: make remove callback return void (diff) | |
| download | linux-0573d3fa48640f0fa6b105ff92dcb02b94d6c1ab.tar.xz linux-0573d3fa48640f0fa6b105ff92dcb02b94d6c1ab.zip | |
Merge branch 'devel-stable' of git://git.armlinux.org.uk/~rmk/linux-arm into char-misc-next
This merges from linux-arm at 860660fd829e ("ARM: 9055/1: mailbox:
arm_mhuv2: make remove callback return void") into char-misc-next to get
the amba fixes from Uwe.
Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Russell King <linux@armlinux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/memory')
| -rw-r--r-- | drivers/memory/pl172.c | 4 | ||||
| -rw-r--r-- | drivers/memory/pl353-smc.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/memory/pl172.c b/drivers/memory/pl172.c index 575fadbffa30..9eb8cc7de494 100644 --- a/drivers/memory/pl172.c +++ b/drivers/memory/pl172.c @@ -273,14 +273,12 @@ err_clk_enable: 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[] = { diff --git a/drivers/memory/pl353-smc.c b/drivers/memory/pl353-smc.c index 73bd3023202f..3b5b1045edd9 100644 --- a/drivers/memory/pl353-smc.c +++ b/drivers/memory/pl353-smc.c @@ -426,14 +426,12 @@ out_clk_dis_aper: 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[] = { |