diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2021-02-22 16:09:55 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2021-02-22 16:09:55 +0300 |
| commit | 90e53c5e09251edb2cee367f6cb472e4bac121f2 (patch) | |
| tree | 797296eb8ef5de54a6ec919c0c1f7e1940262c4e /drivers/char | |
| parent | fd749fe4bcb00ad80d9eece709f804bb4ac6bf1e (diff) | |
| parent | 860660fd829e64d4deb255fac9d73ab84a1440c3 (diff) | |
| download | linux-90e53c5e09251edb2cee367f6cb472e4bac121f2.tar.xz | |
Merge branch 'devel-stable' into for-linus
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[] = { |