diff options
| author | Greg Kroah-Hartman | 2021-02-05 11:15:43 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2021-02-05 11:15:43 +0100 |
| commit | 0573d3fa48640f0fa6b105ff92dcb02b94d6c1ab (patch) | |
| tree | 9ec7ef79856a7aff2d4230adcaa9073d20919afb /drivers/char | |
| parent | 51571108888a9ff666859682784366e597ce84da (diff) | |
| parent | 860660fd829e64d4deb255fac9d73ab84a1440c3 (diff) | |
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/char')
| -rw-r--r-- | drivers/char/hw_random/nomadik-rng.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/hw_random/nomadik-rng.c b/drivers/char/hw_random/nomadik-rng.c index b0ded41eb865..67947a19aa22 100644 --- a/drivers/char/hw_random/nomadik-rng.c +++ b/drivers/char/hw_random/nomadik-rng.c @@ -69,11 +69,10 @@ out_clk: 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[] = { |