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

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

diff --git a/sound/soc/codecs/rt5682s.c b/sound/soc/codecs/rt5682s.c
index 5199d3bbaf0b996f3b1f4e7f069f97c500ca8131..80c673aa14db8f272fce209a36cf70a8ef3c48bd 100644 (file)
--- a/sound/soc/codecs/rt5682s.c
+++ b/sound/soc/codecs/rt5682s.c
@@ -3256,11 +3256,9 @@ static void rt5682s_i2c_shutdown(struct i2c_client *client)
        rt5682s_reset(rt5682s);
 }
 
-static int rt5682s_i2c_remove(struct i2c_client *client)
+static void rt5682s_i2c_remove(struct i2c_client *client)
 {
        rt5682s_i2c_shutdown(client);
-
-       return 0;
 }
 
 static const struct of_device_id rt5682s_of_match[] = {