Merge tag 'i2c-for-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[platform/kernel/linux-starfive.git] / drivers / net / dsa / xrs700x / xrs700x_i2c.c

diff --git a/drivers/net/dsa/xrs700x/xrs700x_i2c.c b/drivers/net/dsa/xrs700x/xrs700x_i2c.c
index 6deae38..54065cd 100644 (file)
--- a/drivers/net/dsa/xrs700x/xrs700x_i2c.c
+++ b/drivers/net/dsa/xrs700x/xrs700x_i2c.c
@@ -105,18 +105,14 @@ static int xrs700x_i2c_probe(struct i2c_client *i2c,
        return 0;
 }
 
-static int xrs700x_i2c_remove(struct i2c_client *i2c)
+static void xrs700x_i2c_remove(struct i2c_client *i2c)
 {
        struct xrs700x *priv = i2c_get_clientdata(i2c);
 
        if (!priv)
-               return 0;
+               return;
 
        xrs700x_switch_remove(priv);
-
-       i2c_set_clientdata(i2c, NULL);
-
-       return 0;
 }
 
 static void xrs700x_i2c_shutdown(struct i2c_client *i2c)