* [RESEND PATCH v4 0/2] Use devm_* functions for Melfas touch device @ 2014-05-28 9:13 Beomho Seo 2014-05-28 9:13 ` [RESEND PATCH v4 1/2] Input: mcs_touchkey: use devm_* functions Beomho Seo 2014-05-28 9:13 ` [RESEND PATCH v4 2/2] Input: mcs5000_ts: " Beomho Seo 0 siblings, 2 replies; 5+ messages in thread From: Beomho Seo @ 2014-05-28 9:13 UTC (permalink / raw) To: linux-input, dmitry.torokhov, jy0922.shim, sachin.kamat Cc: myungjoo.ham, jh80.chung, cw00.choi, Beomho Seo This patch set devm_* functions in Melfas touche device driver. As a result, error path and remove() function is simplified. Changes in v4: - mcs_touchkey: add free_irq for equivalent transformation. Changes in v3: - mcs_touchkey: Some codes are back again. Changes in v2: - Additionally use devm_kzalloc mcs_[touchkey/ts]_data struct. Beomho Seo (2): Input: mcs_touchkey: use devm_* functions Input: mcs5000_ts: use devm_* functions drivers/input/keyboard/mcs_touchkey.c | 34 +++++++++----------------- drivers/input/touchscreen/mcs5000_ts.c | 42 +++++++++----------------------- 2 files changed, 24 insertions(+), 52 deletions(-) -- 1.7.9.5 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [RESEND PATCH v4 1/2] Input: mcs_touchkey: use devm_* functions 2014-05-28 9:13 [RESEND PATCH v4 0/2] Use devm_* functions for Melfas touch device Beomho Seo @ 2014-05-28 9:13 ` Beomho Seo 2014-05-28 16:37 ` Dmitry Torokhov 2014-05-28 9:13 ` [RESEND PATCH v4 2/2] Input: mcs5000_ts: " Beomho Seo 1 sibling, 1 reply; 5+ messages in thread From: Beomho Seo @ 2014-05-28 9:13 UTC (permalink / raw) To: linux-input, dmitry.torokhov, jy0922.shim, sachin.kamat Cc: myungjoo.ham, jh80.chung, cw00.choi, Beomho Seo This patch use devm_* funtions in mcs_touchkey driver. As a result, error path and remove() funtion is simplified. Signed-off-by: Beomho Seo <beomho.seo@samsung.com> --- 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 | 34 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/drivers/input/keyboard/mcs_touchkey.c b/drivers/input/keyboard/mcs_touchkey.c index 1da8e0b..48a341c 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,22 @@ 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; + if (error) { + 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 +198,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 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [RESEND PATCH v4 1/2] Input: mcs_touchkey: use devm_* functions 2014-05-28 9:13 ` [RESEND PATCH v4 1/2] Input: mcs_touchkey: use devm_* functions Beomho Seo @ 2014-05-28 16:37 ` Dmitry Torokhov 0 siblings, 0 replies; 5+ messages in thread From: Dmitry Torokhov @ 2014-05-28 16:37 UTC (permalink / raw) To: Beomho Seo Cc: linux-input, jy0922.shim, sachin.kamat, myungjoo.ham, jh80.chung, cw00.choi On Wed, May 28, 2014 at 06:13:15PM +0900, Beomho Seo wrote: > This patch use devm_* funtions in mcs_touchkey driver. > As a result, error path and remove() funtion is simplified. > > Signed-off-by: Beomho Seo <beomho.seo@samsung.com> > --- > 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 | 34 ++++++++++++--------------------- > 1 file changed, 12 insertions(+), 22 deletions(-) > > diff --git a/drivers/input/keyboard/mcs_touchkey.c b/drivers/input/keyboard/mcs_touchkey.c > index 1da8e0b..48a341c 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,22 @@ 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; > + if (error) { > + 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 +198,6 @@ static int mcs_touchkey_remove(struct i2c_client *client) > free_irq(client->irq, data); No, you can not use free_irq() on managed IRQ. If you want to do devm conversion I'd rather you used devm_add_action() to schedule call to data->poweron(false). Thanks. > if (data->poweron) > data->poweron(false); > - input_unregister_device(data->input_dev); > - kfree(data); > > return 0; > } > -- > 1.7.9.5 > -- Dmitry ^ permalink raw reply [flat|nested] 5+ messages in thread
* [RESEND PATCH v4 2/2] Input: mcs5000_ts: use devm_* functions 2014-05-28 9:13 [RESEND PATCH v4 0/2] Use devm_* functions for Melfas touch device Beomho Seo 2014-05-28 9:13 ` [RESEND PATCH v4 1/2] Input: mcs_touchkey: use devm_* functions Beomho Seo @ 2014-05-28 9:13 ` Beomho Seo 2014-05-29 7:10 ` Dmitry Torokhov 1 sibling, 1 reply; 5+ messages in thread From: Beomho Seo @ 2014-05-28 9:13 UTC (permalink / raw) To: linux-input, dmitry.torokhov, jy0922.shim, sachin.kamat Cc: myungjoo.ham, jh80.chung, cw00.choi, Beomho Seo This patch use devm_* functions in mcs5000_ts driver. As, a result, error patch and remove() function is simplified. Signed-off-by: Beomho Seo <beomho.seo@samsung.com> --- Changes in v4: - None. Changes in v3: - None. Changes in v2: - Additionally use devm_kzalloc for mcs_ts_data struct. --- drivers/input/touchscreen/mcs5000_ts.c | 42 +++++++++----------------------- 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/drivers/input/touchscreen/mcs5000_ts.c b/drivers/input/touchscreen/mcs5000_ts.c index 647e36f..6b57e28 100644 --- a/drivers/input/touchscreen/mcs5000_ts.c +++ b/drivers/input/touchscreen/mcs5000_ts.c @@ -196,12 +196,11 @@ static int mcs5000_ts_probe(struct i2c_client *client, if (!dev_get_platdata(&client->dev)) return -EINVAL; - data = kzalloc(sizeof(struct mcs5000_ts_data), 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"); - ret = -ENOMEM; - goto err_free_mem; + return -ENOMEM; } data->client = client; @@ -223,40 +222,24 @@ static int mcs5000_ts_probe(struct i2c_client *client, if (data->platform_data->cfg_pin) data->platform_data->cfg_pin(); - ret = request_threaded_irq(client->irq, NULL, mcs5000_ts_interrupt, - IRQF_TRIGGER_LOW | IRQF_ONESHOT, "mcs5000_ts", data); - - if (ret < 0) { + ret = devm_request_threaded_irq(&client->dev, client->irq, NULL, + mcs5000_ts_interrupt, IRQF_TRIGGER_LOW | IRQF_ONESHOT, + "mcs5000_ts", data); + if (ret) { dev_err(&client->dev, "Failed to register interrupt\n"); - goto err_free_mem; + return ret; } ret = input_register_device(data->input_dev); - if (ret < 0) - goto err_free_irq; + if (ret < 0) { + dev_err(&client->dev, "Failed to register input device\n"); + return ret; + } mcs5000_ts_phys_init(data); 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 ret; -} - -static int mcs5000_ts_remove(struct i2c_client *client) -{ - struct mcs5000_ts_data *data = i2c_get_clientdata(client); - - free_irq(client->irq, data); - input_unregister_device(data->input_dev); - kfree(data); - - return 0; } #ifdef CONFIG_PM @@ -291,7 +274,6 @@ MODULE_DEVICE_TABLE(i2c, mcs5000_ts_id); static struct i2c_driver mcs5000_ts_driver = { .probe = mcs5000_ts_probe, - .remove = mcs5000_ts_remove, .driver = { .name = "mcs5000_ts", #ifdef CONFIG_PM -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [RESEND PATCH v4 2/2] Input: mcs5000_ts: use devm_* functions 2014-05-28 9:13 ` [RESEND PATCH v4 2/2] Input: mcs5000_ts: " Beomho Seo @ 2014-05-29 7:10 ` Dmitry Torokhov 0 siblings, 0 replies; 5+ messages in thread From: Dmitry Torokhov @ 2014-05-29 7:10 UTC (permalink / raw) To: Beomho Seo Cc: linux-input, jy0922.shim, sachin.kamat, myungjoo.ham, jh80.chung, cw00.choi On Wed, May 28, 2014 at 06:13:16PM +0900, Beomho Seo wrote: > This patch use devm_* functions in mcs5000_ts driver. > As, a result, error patch and remove() function is simplified. Applied, thank you. > > Signed-off-by: Beomho Seo <beomho.seo@samsung.com> > --- > Changes in v4: > - None. > Changes in v3: > - None. > Changes in v2: > - Additionally use devm_kzalloc for mcs_ts_data struct. > --- > drivers/input/touchscreen/mcs5000_ts.c | 42 +++++++++----------------------- > 1 file changed, 12 insertions(+), 30 deletions(-) > > diff --git a/drivers/input/touchscreen/mcs5000_ts.c b/drivers/input/touchscreen/mcs5000_ts.c > index 647e36f..6b57e28 100644 > --- a/drivers/input/touchscreen/mcs5000_ts.c > +++ b/drivers/input/touchscreen/mcs5000_ts.c > @@ -196,12 +196,11 @@ static int mcs5000_ts_probe(struct i2c_client *client, > if (!dev_get_platdata(&client->dev)) > return -EINVAL; > > - data = kzalloc(sizeof(struct mcs5000_ts_data), 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"); > - ret = -ENOMEM; > - goto err_free_mem; > + return -ENOMEM; > } > > data->client = client; > @@ -223,40 +222,24 @@ static int mcs5000_ts_probe(struct i2c_client *client, > if (data->platform_data->cfg_pin) > data->platform_data->cfg_pin(); > > - ret = request_threaded_irq(client->irq, NULL, mcs5000_ts_interrupt, > - IRQF_TRIGGER_LOW | IRQF_ONESHOT, "mcs5000_ts", data); > - > - if (ret < 0) { > + ret = devm_request_threaded_irq(&client->dev, client->irq, NULL, > + mcs5000_ts_interrupt, IRQF_TRIGGER_LOW | IRQF_ONESHOT, > + "mcs5000_ts", data); > + if (ret) { > dev_err(&client->dev, "Failed to register interrupt\n"); > - goto err_free_mem; > + return ret; > } > > ret = input_register_device(data->input_dev); > - if (ret < 0) > - goto err_free_irq; > + if (ret < 0) { > + dev_err(&client->dev, "Failed to register input device\n"); > + return ret; > + } > > mcs5000_ts_phys_init(data); > 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 ret; > -} > - > -static int mcs5000_ts_remove(struct i2c_client *client) > -{ > - struct mcs5000_ts_data *data = i2c_get_clientdata(client); > - > - free_irq(client->irq, data); > - input_unregister_device(data->input_dev); > - kfree(data); > - > - return 0; > } > > #ifdef CONFIG_PM > @@ -291,7 +274,6 @@ MODULE_DEVICE_TABLE(i2c, mcs5000_ts_id); > > static struct i2c_driver mcs5000_ts_driver = { > .probe = mcs5000_ts_probe, > - .remove = mcs5000_ts_remove, > .driver = { > .name = "mcs5000_ts", > #ifdef CONFIG_PM > -- > 1.7.9.5 > -- Dmitry ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-05-29 7:10 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-05-28 9:13 [RESEND PATCH v4 0/2] Use devm_* functions for Melfas touch device Beomho Seo 2014-05-28 9:13 ` [RESEND PATCH v4 1/2] Input: mcs_touchkey: use devm_* functions Beomho Seo 2014-05-28 16:37 ` Dmitry Torokhov 2014-05-28 9:13 ` [RESEND PATCH v4 2/2] Input: mcs5000_ts: " Beomho Seo 2014-05-29 7:10 ` Dmitry Torokhov
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox