diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2021-02-22 14:09:55 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2021-02-22 14:09:55 +0100 |
| commit | 90e53c5e09251edb2cee367f6cb472e4bac121f2 (patch) | |
| tree | 797296eb8ef5de54a6ec919c0c1f7e1940262c4e /sound | |
| parent | ARM: 9065/1: OABI compat: fix build when EPOLL is not enabled (diff) | |
| parent | ARM: 9055/1: mailbox: arm_mhuv2: make remove callback return void (diff) | |
| download | linux-90e53c5e09251edb2cee367f6cb472e4bac121f2.tar.xz linux-90e53c5e09251edb2cee367f6cb472e4bac121f2.zip | |
Merge branch 'devel-stable' into for-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/arm/aaci.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c index a0996c47e58f..b326a5f5f0d5 100644 --- a/sound/arm/aaci.c +++ b/sound/arm/aaci.c @@ -1055,7 +1055,7 @@ static int aaci_probe(struct amba_device *dev, return ret; } -static int aaci_remove(struct amba_device *dev) +static void aaci_remove(struct amba_device *dev) { struct snd_card *card = amba_get_drvdata(dev); @@ -1066,8 +1066,6 @@ static int aaci_remove(struct amba_device *dev) snd_card_free(card); amba_release_regions(dev); } - - return 0; } static struct amba_id aaci_ids[] = { |