[PATCH v4 1/2] Input: mcs_touchkey: use devm_* functions
From: Beomho Seo <hidden>
Date: 2014-05-28 08:41:25
Subsystem:
input (keyboard, mouse, joystick, touchscreen) drivers, the rest · Maintainers:
Dmitry Torokhov, Linus Torvalds
This patch use devm_* funtions in mcs_touchkey driver. As a result, error path and remove() funtion is simplified. Signed-off-by: Beomho Seo <redacted> --- Changes in v4: - free_irq are back again for equivalent transformation. Changes in v3: - Some codes are back again. use fw_version, driver name and poweron. Changes in v2: - Additionally use devm_kzalloc for mcs_touchkey_data struct. --- drivers/input/keyboard/mcs_touchkey.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-)
diff --git a/drivers/input/keyboard/mcs_touchkey.c b/drivers/input/keyboard/mcs_touchkey.c
index 1da8e0b..d85adbf 100644
--- a/drivers/input/keyboard/mcs_touchkey.c
+++ b/drivers/input/keyboard/mcs_touchkey.c@@ -113,14 +113,11 @@ static int mcs_touchkey_probe(struct i2c_client *client, return -EINVAL; } - data = kzalloc(sizeof(struct mcs_touchkey_data) + - sizeof(data->keycodes[0]) * (pdata->key_maxval + 1), - GFP_KERNEL); - input_dev = input_allocate_device(); + data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL); + input_dev = devm_input_allocate_device(&client->dev); if (!data || !input_dev) { dev_err(&client->dev, "Failed to allocate memory\n"); - error = -ENOMEM; - goto err_free_mem; + return -ENOMEM; } data->client = client;
@@ -143,7 +140,7 @@ static int mcs_touchkey_probe(struct i2c_client *client, if (fw_ver < 0) { error = fw_ver; dev_err(&client->dev, "i2c read error[%d]\n", error); - goto err_free_mem; + return error; } dev_info(&client->dev, "Firmware version: %d\n", fw_ver);
@@ -176,27 +173,21 @@ static int mcs_touchkey_probe(struct i2c_client *client, data->poweron(true); } - 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; + dev_err(&client->dev, "Failed to register input device\n"); + 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 int mcs_touchkey_remove(struct i2c_client *client)
@@ -206,8 +197,6 @@ static int mcs_touchkey_remove(struct i2c_client *client) free_irq(client->irq, data); if (data->poweron) data->poweron(false); - input_unregister_device(data->input_dev); - kfree(data); return 0; }
--
1.7.9.5