Merge tag 'acpi-6.5-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[sfrench/cifs-2.6.git] / drivers / i2c / busses / i2c-scmi.c

diff --git a/drivers/i2c/busses/i2c-scmi.c b/drivers/i2c/busses/i2c-scmi.c
index ebac454986e7ae6598d9209f5552f3d35e922534..421735acfa141f2394aaca68b0b872f3accd09b1 100644 (file)
--- a/drivers/i2c/busses/i2c-scmi.c
+++ b/drivers/i2c/busses/i2c-scmi.c
@@ -401,19 +401,17 @@ err:
        return ret;
 }
 
-static int smbus_cmi_remove(struct platform_device *device)
+static void smbus_cmi_remove(struct platform_device *device)
 {
        struct acpi_smbus_cmi *smbus_cmi = platform_get_drvdata(device);
 
        i2c_del_adapter(&smbus_cmi->adapter);
        kfree(smbus_cmi);
-
-       return 0;
 }
 
 static struct platform_driver smbus_cmi_driver = {
        .probe = smbus_cmi_probe,
-       .remove = smbus_cmi_remove,
+       .remove_new = smbus_cmi_remove,
        .driver = {
                .name   = "smbus_cmi",
                .acpi_match_table = acpi_smbus_cmi_ids,