1 files changed, 5 insertions, 19 deletions

diff --git a/drivers/hwmon/lineage-pem.c b/drivers/hwmon/lineage-pem.c
index 58eded27f385..d264937c7f5e 100644
--- a/drivers/hwmon/lineage-pem.c
+++ b/drivers/hwmon/lineage-pem.c
@@ -448,7 +448,7 @@ static int pem_probe(struct i2c_client *client,
                                      | I2C_FUNC_SMBUS_WRITE_BYTE))
                 return -ENODEV;
 
-        data = kzalloc(sizeof(*data), GFP_KERNEL);
+        data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
         if (!data)
                 return -ENOMEM;
 
@@ -462,11 +462,11 @@ static int pem_probe(struct i2c_client *client,
         ret = pem_read_block(client, PEM_READ_FIRMWARE_REV,
                              data->firmware_rev, sizeof(data->firmware_rev));
         if (ret < 0)
-                goto out_kfree;
+                return ret;
 
         ret = i2c_smbus_write_byte(client, PEM_CLEAR_INFO_FLAGS);
         if (ret < 0)
-                goto out_kfree;
+                return ret;
 
         dev_info(&client->dev, "Firmware revision %d.%d.%d\n",
                  data->firmware_rev[0], data->firmware_rev[1],
@@ -475,7 +475,7 @@ static int pem_probe(struct i2c_client *client,
         /* Register sysfs hooks */
         ret = sysfs_create_group(&client->dev.kobj, &pem_group);
         if (ret)
-                goto out_kfree;
+                return ret;
 
         /*
          * Check if input readings are supported.
@@ -534,8 +534,6 @@ out_remove_groups:
         sysfs_remove_group(&client->dev.kobj, &pem_input_group);
         sysfs_remove_group(&client->dev.kobj, &pem_fan_group);
         sysfs_remove_group(&client->dev.kobj, &pem_group);
-out_kfree:
-        kfree(data);
         return ret;
 }
 
@@ -549,7 +547,6 @@ static int pem_remove(struct i2c_client *client)
         sysfs_remove_group(&client->dev.kobj, &pem_fan_group);
         sysfs_remove_group(&client->dev.kobj, &pem_group);
 
-        kfree(data);
         return 0;
 }
 
@@ -568,19 +565,8 @@ static struct i2c_driver pem_driver = {
         .id_table = pem_id,
 };
 
-static int __init pem_init(void)
-{
-        return i2c_add_driver(&pem_driver);
-}
-
-static void __exit pem_exit(void)
-{
-        i2c_del_driver(&pem_driver);
-}
+module_i2c_driver(pem_driver);
 
 MODULE_AUTHOR("Guenter Roeck <guenter.roeck@ericsson.com>");
 MODULE_DESCRIPTION("Lineage CPL PEM hardware monitoring driver");
 MODULE_LICENSE("GPL");
-
-module_init(pem_init);
-module_exit(pem_exit);