diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2021-02-22 13:09:55 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2021-02-22 13:09:55 +0000 |
| commit | 90e53c5e09251edb2cee367f6cb472e4bac121f2 (patch) | |
| tree | 797296eb8ef5de54a6ec919c0c1f7e1940262c4e /drivers/rtc/rtc-pl031.c | |
| parent | fd749fe4bcb00ad80d9eece709f804bb4ac6bf1e (diff) | |
| parent | 860660fd829e64d4deb255fac9d73ab84a1440c3 (diff) | |
| download | lwn-90e53c5e09251edb2cee367f6cb472e4bac121f2.tar.gz lwn-90e53c5e09251edb2cee367f6cb472e4bac121f2.zip | |
Merge branch 'devel-stable' into for-linus
Diffstat (limited to 'drivers/rtc/rtc-pl031.c')
| -rw-r--r-- | drivers/rtc/rtc-pl031.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c index 224bbf096262..620c8dc33647 100644 --- a/drivers/rtc/rtc-pl031.c +++ b/drivers/rtc/rtc-pl031.c @@ -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); @@ -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) |