hwmon: (asus_atk0110) Make use of device managed memory

Use devm_* variants of kstrdup and kzalloc. Get rid of kfree cleanups.

Signed-off-by: Bastian Germann <bastiangermann@fishpost.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
index fcba2b82ec71e1d40ab542d46225db5535de026b..a6636fe4218943f01354f4ab995d561d4cff2aa6 100644 (file)
--- a/drivers/hwmon/asus_atk0110.c
+++ b/drivers/hwmon/asus_atk0110.c
@@ -190,7 +190,6 @@ static int atk_add(struct acpi_device *device);
 static int atk_remove(struct acpi_device *device);
 static void atk_print_sensor(struct atk_data *data, union acpi_object *obj);
 static int atk_read_value(struct atk_sensor_data *sensor, u64 *value);
-static void atk_free_sensors(struct atk_data *data);
 
 static struct acpi_driver atk_driver = {
        .name   = ATK_HID,
@@ -906,15 +905,13 @@ static int atk_add_sensor(struct atk_data *data, union acpi_object *obj)
        limit1 = atk_get_pack_member(data, obj, HWMON_PACK_LIMIT1);
        limit2 = atk_get_pack_member(data, obj, HWMON_PACK_LIMIT2);
 
-       sensor = kzalloc(sizeof(*sensor), GFP_KERNEL);
+       sensor = devm_kzalloc(dev, sizeof(*sensor), GFP_KERNEL);
        if (!sensor)
                return -ENOMEM;
 
-       sensor->acpi_name = kstrdup(name->string.pointer, GFP_KERNEL);
-       if (!sensor->acpi_name) {
-               err = -ENOMEM;
-               goto out;
-       }
+       sensor->acpi_name = devm_kstrdup(dev, name->string.pointer, GFP_KERNEL);
+       if (!sensor->acpi_name)
+               return -ENOMEM;
 
        INIT_LIST_HEAD(&sensor->list);
        sensor->type = type;
@@ -955,9 +952,6 @@ static int atk_add_sensor(struct atk_data *data, union acpi_object *obj)
        (*num)++;
 
        return 1;
-out:
-       kfree(sensor);
-       return err;
 }
 
 static int atk_enumerate_old_hwmon(struct atk_data *data)
@@ -998,8 +992,7 @@ static int atk_enumerate_old_hwmon(struct atk_data *data)
                dev_warn(dev, METHOD_OLD_ENUM_TMP ": ACPI exception: %s\n",
                                acpi_format_exception(status));
 
-               ret = -ENODEV;
-               goto cleanup;
+               return -ENODEV;
        }
 
        pack = buf.pointer;
@@ -1020,8 +1013,7 @@ static int atk_enumerate_old_hwmon(struct atk_data *data)
                dev_warn(dev, METHOD_OLD_ENUM_FAN ": ACPI exception: %s\n",
                                acpi_format_exception(status));
 
-               ret = -ENODEV;
-               goto cleanup;
+               return -ENODEV;
        }
 
        pack = buf.pointer;
@@ -1035,9 +1027,6 @@ static int atk_enumerate_old_hwmon(struct atk_data *data)
        ACPI_FREE(buf.pointer);
 
        return count;
-cleanup:
-       atk_free_sensors(data);
-       return ret;
 }
 
 static int atk_ec_present(struct atk_data *data)
@@ -1213,17 +1202,6 @@ static int atk_init_attribute_groups(struct atk_data *data)
        return 0;
 }
 
-static void atk_free_sensors(struct atk_data *data)
-{
-       struct list_head *head = &data->sensor_list;
-       struct atk_sensor_data *s, *tmp;
-
-       list_for_each_entry_safe(s, tmp, head, list) {
-               kfree(s->acpi_name);
-               kfree(s);
-       }
-}
-
 static int atk_register_hwmon(struct atk_data *data)
 {
        struct device *dev = &data->acpi_dev->dev;
@@ -1323,7 +1301,7 @@ static int atk_add(struct acpi_device *device)
 
        dev_dbg(&device->dev, "adding...\n");
 
-       data = kzalloc(sizeof(*data), GFP_KERNEL);
+       data = devm_kzalloc(&device->dev, sizeof(*data), GFP_KERNEL);
        if (!data)
                return -ENOMEM;
 
@@ -1375,18 +1353,15 @@ static int atk_add(struct acpi_device *device)
                goto out;
        err = atk_register_hwmon(data);
        if (err)
-               goto cleanup;
+               goto out;
 
        atk_debugfs_init(data);
 
        device->driver_data = data;
        return 0;
-cleanup:
-       atk_free_sensors(data);
 out:
        if (data->disable_ec)
                atk_ec_ctl(data, 0);
-       kfree(data);
        return err;
 }
 
@@ -1399,7 +1374,6 @@ static int atk_remove(struct acpi_device *device)
 
        atk_debugfs_cleanup(data);
 
-       atk_free_sensors(data);
        hwmon_device_unregister(data->hwmon_dev);
 
        if (data->disable_ec) {
@@ -1407,8 +1381,6 @@ static int atk_remove(struct acpi_device *device)
                        dev_err(&device->dev, "Failed to disable EC\n");
        }
 
-       kfree(data);
-
        return 0;
 }