Merge tag 'usb-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[platform/kernel/linux-starfive.git] / drivers / usb / typec / tcpm / tcpci.c

diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c
index 50674ec..b2bfceb 100644 (file)
--- a/drivers/usb/typec/tcpm/tcpci.c
+++ b/drivers/usb/typec/tcpm/tcpci.c
@@ -846,7 +846,7 @@ static int tcpci_probe(struct i2c_client *client,
        return 0;
 }
 
-static int tcpci_remove(struct i2c_client *client)
+static void tcpci_remove(struct i2c_client *client)
 {
        struct tcpci_chip *chip = i2c_get_clientdata(client);
        int err;
@@ -857,8 +857,6 @@ static int tcpci_remove(struct i2c_client *client)
                dev_warn(&client->dev, "Failed to disable irqs (%pe)\n", ERR_PTR(err));
 
        tcpci_unregister_port(chip->tcpci);
-
-       return 0;
 }
 
 static const struct i2c_device_id tcpci_id[] = {