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

[platform/kernel/linux-rpi.git] / drivers / usb / typec / ucsi / ucsi_ccg.c

diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c
index cbd93f8..835f1c4 100644 (file)
--- a/drivers/usb/typec/ucsi/ucsi_ccg.c
+++ b/drivers/usb/typec/ucsi/ucsi_ccg.c
@@ -1415,7 +1415,7 @@ out_ucsi_destroy:
        return status;
 }
 
-static int ucsi_ccg_remove(struct i2c_client *client)
+static void ucsi_ccg_remove(struct i2c_client *client)
 {
        struct ucsi_ccg *uc = i2c_get_clientdata(client);
 
@@ -1425,8 +1425,6 @@ static int ucsi_ccg_remove(struct i2c_client *client)
        ucsi_unregister(uc->ucsi);
        ucsi_destroy(uc->ucsi);
        free_irq(uc->irq, uc);
-
-       return 0;
 }
 
 static const struct i2c_device_id ucsi_ccg_device_id[] = {