Input: mcs-touchkey - convert to use devm_* api

Use devm_* api to simplify code, this makes it unnecessary to explicitly
release resources.

Signed-off-by: Yangtao Li <frank.li@vivo.com>
Link: https://lore.kernel.org/r/20230714080611.81302-3-frank.li@vivo.com
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/keyboard/mcs_touchkey.c b/drivers/input/keyboard/mcs_touchkey.c
index de312d8eb974d543b44eb1a18ce60e908182c590..f25e2b20e271503faacfce961075d9f0bb3ff62b 100644 (file)
--- a/drivers/input/keyboard/mcs_touchkey.c
+++ b/drivers/input/keyboard/mcs_touchkey.c
@@ -92,6 +92,13 @@ static irqreturn_t mcs_touchkey_interrupt(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
+static void mcs_touchkey_poweroff(void *data)
+{
+       struct mcs_touchkey_data *touchkey = data;
+
+       touchkey->poweron(false);
+}
+
 static int mcs_touchkey_probe(struct i2c_client *client)
 {
        const struct i2c_device_id *id = i2c_client_get_device_id(client);
@@ -109,13 +116,16 @@ static int mcs_touchkey_probe(struct i2c_client *client)
                return -EINVAL;
        }
 
-       data = kzalloc(struct_size(data, keycodes, pdata->key_maxval + 1),
-                      GFP_KERNEL);
-       input_dev = input_allocate_device();
-       if (!data || !input_dev) {
-               dev_err(&client->dev, "Failed to allocate memory\n");
-               error = -ENOMEM;
-               goto err_free_mem;
+       data = devm_kzalloc(&client->dev,
+                           struct_size(data, keycodes, pdata->key_maxval + 1),
+                           GFP_KERNEL);
+       if (!data)
+               return -ENOMEM;
+
+       input_dev = devm_input_allocate_device(&client->dev);
+       if (!input_dev) {
+               dev_err(&client->dev, "Failed to allocate input device\n");
+               return -ENOMEM;
        }
 
        data->client = client;
@@ -136,15 +146,13 @@ static int mcs_touchkey_probe(struct i2c_client *client)
 
        fw_ver = i2c_smbus_read_byte_data(client, fw_reg);
        if (fw_ver < 0) {
-               error = fw_ver;
                dev_err(&client->dev, "i2c read error[%d]\n", error);
-               goto err_free_mem;
+               return fw_ver;
        }
        dev_info(&client->dev, "Firmware version: %d\n", fw_ver);
 
        input_dev->name = "MELFAS MCS Touchkey";
        input_dev->id.bustype = BUS_I2C;
-       input_dev->dev.parent = &client->dev;
        input_dev->evbit[0] = BIT_MASK(EV_KEY);
        if (!pdata->no_autorepeat)
                input_dev->evbit[0] |= BIT_MASK(EV_REP);
@@ -169,40 +177,28 @@ static int mcs_touchkey_probe(struct i2c_client *client)
        if (pdata->poweron) {
                data->poweron = pdata->poweron;
                data->poweron(true);
+
+               error = devm_add_action_or_reset(&client->dev,
+                                                mcs_touchkey_poweroff, data);
+               if (error)
+                       return error;
        }
 
-       error = request_threaded_irq(client->irq, NULL, mcs_touchkey_interrupt,
-                                    IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
-                                    client->dev.driver->name, data);
+       error = devm_request_threaded_irq(&client->dev, client->irq,
+                                         NULL, mcs_touchkey_interrupt,
+                                         IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
+                                         client->dev.driver->name, data);
        if (error) {
                dev_err(&client->dev, "Failed to register interrupt\n");
-               goto err_free_mem;
+               return error;
        }
 
        error = input_register_device(input_dev);
        if (error)
-               goto err_free_irq;
+               return error;
 
        i2c_set_clientdata(client, data);
        return 0;
-
-err_free_irq:
-       free_irq(client->irq, data);
-err_free_mem:
-       input_free_device(input_dev);
-       kfree(data);
-       return error;
-}
-
-static void mcs_touchkey_remove(struct i2c_client *client)
-{
-       struct mcs_touchkey_data *data = i2c_get_clientdata(client);
-
-       free_irq(client->irq, data);
-       if (data->poweron)
-               data->poweron(false);
-       input_unregister_device(data->input_dev);
-       kfree(data);
 }
 
 static void mcs_touchkey_shutdown(struct i2c_client *client)
@@ -259,7 +255,6 @@ static struct i2c_driver mcs_touchkey_driver = {
                .pm     = pm_sleep_ptr(&mcs_touchkey_pm_ops),
        },
        .probe          = mcs_touchkey_probe,
-       .remove         = mcs_touchkey_remove,
        .shutdown       = mcs_touchkey_shutdown,
        .id_table       = mcs_touchkey_id,
 };