diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-01-07 20:52:46 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-01-07 20:52:58 +0300 |
| commit | 6dcb8bf9a1d7f6d137a17b76177cd67e9b8e023d (patch) | |
| tree | f73ca2bee2f77eb965f049d10e10636a0ff718a0 /sound/ppc | |
| parent | 64062869f0d63d118560c15f671376b43f71b102 (diff) | |
| parent | 7b62275507232f01f66d3e7d05c77bbd9009b726 (diff) | |
| download | linux-6dcb8bf9a1d7f6d137a17b76177cd67e9b8e023d.tar.xz | |
Merge branch 'for-linus' into for-next
Back-merge of 5.11-devel branch for syncing the result changes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/ppc')
| -rw-r--r-- | sound/ppc/snd_ps3.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c index 966b709ee286..631a61ce52f4 100644 --- a/sound/ppc/snd_ps3.c +++ b/sound/ppc/snd_ps3.c @@ -1044,7 +1044,7 @@ clean_open: }; /* snd_ps3_probe */ /* called when module removal */ -static int snd_ps3_driver_remove(struct ps3_system_bus_device *dev) +static void snd_ps3_driver_remove(struct ps3_system_bus_device *dev) { int ret; pr_info("%s:start id=%d\n", __func__, dev->match_id); @@ -1070,7 +1070,6 @@ static int snd_ps3_driver_remove(struct ps3_system_bus_device *dev) lv1_gpu_device_unmap(2); ps3_close_hv_device(dev); pr_info("%s:end id=%d\n", __func__, dev->match_id); - return 0; } /* snd_ps3_remove */ static struct ps3_system_bus_driver snd_ps3_bus_driver_info = { |