Merge existing fixes from asoc/for-6.1 into new branch

[sfrench/cifs-2.6.git] / sound / soc / codecs / wm8962.c

diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c
index 6df06fba43778f81a0638ebad0a8acd84fa8bbce..b4b4355c6728b0c4977bcd3f0b24006561c432bf 100644 (file)
--- a/sound/soc/codecs/wm8962.c
+++ b/sound/soc/codecs/wm8962.c
@@ -3828,10 +3828,9 @@ err:
        return ret;
 }
 
-static int wm8962_i2c_remove(struct i2c_client *client)
+static void wm8962_i2c_remove(struct i2c_client *client)
 {
        pm_runtime_disable(&client->dev);
-       return 0;
 }
 
 #ifdef CONFIG_PM