* [PATCH] Input: arizona-haptic - convert to use managed input devices
@ 2015-07-06 17:38 Dmitry Torokhov
2015-07-06 19:33 ` Joshua Clayton
0 siblings, 1 reply; 5+ messages in thread
From: Dmitry Torokhov @ 2015-07-06 17:38 UTC (permalink / raw)
To: linux-input; +Cc: Mark Brown, linux-kernel
Using managed input device (via devm_input_allocate_device) simplifies
error handling and driver removal paths and also silences CID# 712569.
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
drivers/input/misc/arizona-haptics.c | 52 ++++++++++++------------------------
1 file changed, 17 insertions(+), 35 deletions(-)
diff --git a/drivers/input/misc/arizona-haptics.c b/drivers/input/misc/arizona-haptics.c
index 4dbbed7..54ebef2 100644
--- a/drivers/input/misc/arizona-haptics.c
+++ b/drivers/input/misc/arizona-haptics.c
@@ -152,7 +152,7 @@ static int arizona_haptics_probe(struct platform_device *pdev)
{
struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
struct arizona_haptics *haptics;
- int ret;
+ int error;
haptics = devm_kzalloc(&pdev->dev, sizeof(*haptics), GFP_KERNEL);
if (!haptics)
@@ -160,18 +160,18 @@ static int arizona_haptics_probe(struct platform_device *pdev)
haptics->arizona = arizona;
- ret = regmap_update_bits(arizona->regmap, ARIZONA_HAPTICS_CONTROL_1,
- ARIZONA_HAP_ACT, arizona->pdata.hap_act);
- if (ret != 0) {
+ error = regmap_update_bits(arizona->regmap, ARIZONA_HAPTICS_CONTROL_1,
+ ARIZONA_HAP_ACT, arizona->pdata.hap_act);
+ if (error) {
dev_err(arizona->dev, "Failed to set haptics actuator: %d\n",
- ret);
- return ret;
+ error);
+ return error;
}
INIT_WORK(&haptics->work, arizona_haptics_work);
- haptics->input_dev = input_allocate_device();
- if (haptics->input_dev == NULL) {
+ haptics->input_dev = devm_input_allocate_device(&pdev->dev);
+ if (!haptics->input_dev) {
dev_err(arizona->dev, "Failed to allocate input device\n");
return -ENOMEM;
}
@@ -183,46 +183,28 @@ static int arizona_haptics_probe(struct platform_device *pdev)
haptics->input_dev->close = arizona_haptics_close;
__set_bit(FF_RUMBLE, haptics->input_dev->ffbit);
- ret = input_ff_create_memless(haptics->input_dev, NULL,
- arizona_haptics_play);
- if (ret < 0) {
+ error = input_ff_create_memless(haptics->input_dev, NULL,
+ arizona_haptics_play);
+ if (error) {
dev_err(arizona->dev, "input_ff_create_memless() failed: %d\n",
- ret);
- goto err_ialloc;
+ error);
+ return error;
}
- ret = input_register_device(haptics->input_dev);
- if (ret < 0) {
+ error = input_register_device(haptics->input_dev);
+ if (error) {
dev_err(arizona->dev, "couldn't register input device: %d\n",
- ret);
- goto err_iff;
+ error);
+ return error;
}
platform_set_drvdata(pdev, haptics);
return 0;
-
-err_iff:
- if (haptics->input_dev)
- input_ff_destroy(haptics->input_dev);
-err_ialloc:
- input_free_device(haptics->input_dev);
-
- return ret;
-}
-
-static int arizona_haptics_remove(struct platform_device *pdev)
-{
- struct arizona_haptics *haptics = platform_get_drvdata(pdev);
-
- input_unregister_device(haptics->input_dev);
-
- return 0;
}
static struct platform_driver arizona_haptics_driver = {
.probe = arizona_haptics_probe,
- .remove = arizona_haptics_remove,
.driver = {
.name = "arizona-haptics",
},
--
2.4.3.573.g4eafbef
--
Dmitry
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Input: arizona-haptic - convert to use managed input devices
2015-07-06 17:38 [PATCH] Input: arizona-haptic - convert to use managed input devices Dmitry Torokhov
@ 2015-07-06 19:33 ` Joshua Clayton
2015-07-06 21:40 ` Dmitry Torokhov
0 siblings, 1 reply; 5+ messages in thread
From: Joshua Clayton @ 2015-07-06 19:33 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: linux-input, Mark Brown, linux-kernel
Hi,
It seems to me that swapping error for ret buries the functional changes in
the patch...
would it be better to split them into a second cleanup patch?
On Monday, July 06, 2015 10:38:41 AM Dmitry Torokhov wrote:
> Using managed input device (via devm_input_allocate_device) simplifies
> error handling and driver removal paths and also silences CID# 712569.
>
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
> drivers/input/misc/arizona-haptics.c | 52
> ++++++++++++------------------------ 1 file changed, 17 insertions(+), 35
> deletions(-)
>
> diff --git a/drivers/input/misc/arizona-haptics.c
> b/drivers/input/misc/arizona-haptics.c index 4dbbed7..54ebef2 100644
> --- a/drivers/input/misc/arizona-haptics.c
> +++ b/drivers/input/misc/arizona-haptics.c
> @@ -152,7 +152,7 @@ static int arizona_haptics_probe(struct platform_device
> *pdev) {
> struct arizona *arizona = dev_get_drvdata(pdev->dev.parent);
> struct arizona_haptics *haptics;
> - int ret;
> + int error;
>
> haptics = devm_kzalloc(&pdev->dev, sizeof(*haptics), GFP_KERNEL);
> if (!haptics)
> @@ -160,18 +160,18 @@ static int arizona_haptics_probe(struct
> platform_device *pdev)
>
> haptics->arizona = arizona;
>
> - ret = regmap_update_bits(arizona->regmap, ARIZONA_HAPTICS_CONTROL_1,
> - ARIZONA_HAP_ACT, arizona->pdata.hap_act);
> - if (ret != 0) {
> + error = regmap_update_bits(arizona->regmap, ARIZONA_HAPTICS_CONTROL_1,
> + ARIZONA_HAP_ACT, arizona->pdata.hap_act);
> + if (error) {
> dev_err(arizona->dev, "Failed to set haptics actuator: %d\n",
> - ret);
> - return ret;
> + error);
> + return error;
> }
>
> INIT_WORK(&haptics->work, arizona_haptics_work);
>
> - haptics->input_dev = input_allocate_device();
> - if (haptics->input_dev == NULL) {
> + haptics->input_dev = devm_input_allocate_device(&pdev->dev);
> + if (!haptics->input_dev) {
> dev_err(arizona->dev, "Failed to allocate input device\n");
> return -ENOMEM;
> }
> @@ -183,46 +183,28 @@ static int arizona_haptics_probe(struct
> platform_device *pdev) haptics->input_dev->close = arizona_haptics_close;
> __set_bit(FF_RUMBLE, haptics->input_dev->ffbit);
>
> - ret = input_ff_create_memless(haptics->input_dev, NULL,
> - arizona_haptics_play);
> - if (ret < 0) {
> + error = input_ff_create_memless(haptics->input_dev, NULL,
> + arizona_haptics_play);
> + if (error) {
This looks OK. No change in behavior. Underlying functions return 0 or a
negative number.
> dev_err(arizona->dev, "input_ff_create_memless() failed: %d\n",
> - ret);
> - goto err_ialloc;
> + error);
> + return error;
> }
>
> - ret = (haptics->input_dev);
> - if (ret < 0) {
> + error = input_register_device(haptics->input_dev);
> + if (error) {
Same here.
...
--
~Joshua Clayton
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Input: arizona-haptic - convert to use managed input devices
2015-07-06 19:33 ` Joshua Clayton
@ 2015-07-06 21:40 ` Dmitry Torokhov
2015-07-17 23:28 ` Dmitry Torokhov
0 siblings, 1 reply; 5+ messages in thread
From: Dmitry Torokhov @ 2015-07-06 21:40 UTC (permalink / raw)
To: Joshua Clayton; +Cc: linux-input, Mark Brown, linux-kernel
On Mon, Jul 06, 2015 at 12:33:06PM -0700, Joshua Clayton wrote:
> Hi,
> It seems to me that swapping error for ret buries the functional changes in
> the patch...
> would it be better to split them into a second cleanup patch?
Fair enough, although I am not sure if I ever get to the renaming again
;)
Thanks.
--
Dmitry
Input: arizona-haptic - convert to use managed input devices
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Using managed input device (via devm_input_allocate_device) simplifies
error handling and driver removal paths and also silences CID# 712569.
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
drivers/input/misc/arizona-haptics.c | 26 ++++----------------------
1 file changed, 4 insertions(+), 22 deletions(-)
diff --git a/drivers/input/misc/arizona-haptics.c b/drivers/input/misc/arizona-haptics.c
index 4dbbed7..4bf6785 100644
--- a/drivers/input/misc/arizona-haptics.c
+++ b/drivers/input/misc/arizona-haptics.c
@@ -170,8 +170,8 @@ static int arizona_haptics_probe(struct platform_device *pdev)
INIT_WORK(&haptics->work, arizona_haptics_work);
- haptics->input_dev = input_allocate_device();
- if (haptics->input_dev == NULL) {
+ haptics->input_dev = devm_input_allocate_device(&pdev->dev);
+ if (!haptics->input_dev) {
dev_err(arizona->dev, "Failed to allocate input device\n");
return -ENOMEM;
}
@@ -188,41 +188,23 @@ static int arizona_haptics_probe(struct platform_device *pdev)
if (ret < 0) {
dev_err(arizona->dev, "input_ff_create_memless() failed: %d\n",
ret);
- goto err_ialloc;
+ return ret;
}
ret = input_register_device(haptics->input_dev);
if (ret < 0) {
dev_err(arizona->dev, "couldn't register input device: %d\n",
ret);
- goto err_iff;
+ return ret;
}
platform_set_drvdata(pdev, haptics);
return 0;
-
-err_iff:
- if (haptics->input_dev)
- input_ff_destroy(haptics->input_dev);
-err_ialloc:
- input_free_device(haptics->input_dev);
-
- return ret;
-}
-
-static int arizona_haptics_remove(struct platform_device *pdev)
-{
- struct arizona_haptics *haptics = platform_get_drvdata(pdev);
-
- input_unregister_device(haptics->input_dev);
-
- return 0;
}
static struct platform_driver arizona_haptics_driver = {
.probe = arizona_haptics_probe,
- .remove = arizona_haptics_remove,
.driver = {
.name = "arizona-haptics",
},
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Input: arizona-haptic - convert to use managed input devices
2015-07-06 21:40 ` Dmitry Torokhov
@ 2015-07-17 23:28 ` Dmitry Torokhov
2015-07-20 14:48 ` Joshua Clayton
0 siblings, 1 reply; 5+ messages in thread
From: Dmitry Torokhov @ 2015-07-17 23:28 UTC (permalink / raw)
To: Joshua Clayton; +Cc: linux-input, Mark Brown, linux-kernel
On Mon, Jul 06, 2015 at 02:40:05PM -0700, Dmitry Torokhov wrote:
> On Mon, Jul 06, 2015 at 12:33:06PM -0700, Joshua Clayton wrote:
> > Hi,
> > It seems to me that swapping error for ret buries the functional changes in
> > the patch...
> > would it be better to split them into a second cleanup patch?
>
> Fair enough, although I am not sure if I ever get to the renaming again
> ;)
Joshua, does the below look OK to you?
Thanks!
>
> Thanks.
>
> --
> Dmitry
>
>
> Input: arizona-haptic - convert to use managed input devices
>
> From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
>
> Using managed input device (via devm_input_allocate_device) simplifies
> error handling and driver removal paths and also silences CID# 712569.
>
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
> drivers/input/misc/arizona-haptics.c | 26 ++++----------------------
> 1 file changed, 4 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/input/misc/arizona-haptics.c b/drivers/input/misc/arizona-haptics.c
> index 4dbbed7..4bf6785 100644
> --- a/drivers/input/misc/arizona-haptics.c
> +++ b/drivers/input/misc/arizona-haptics.c
> @@ -170,8 +170,8 @@ static int arizona_haptics_probe(struct platform_device *pdev)
>
> INIT_WORK(&haptics->work, arizona_haptics_work);
>
> - haptics->input_dev = input_allocate_device();
> - if (haptics->input_dev == NULL) {
> + haptics->input_dev = devm_input_allocate_device(&pdev->dev);
> + if (!haptics->input_dev) {
> dev_err(arizona->dev, "Failed to allocate input device\n");
> return -ENOMEM;
> }
> @@ -188,41 +188,23 @@ static int arizona_haptics_probe(struct platform_device *pdev)
> if (ret < 0) {
> dev_err(arizona->dev, "input_ff_create_memless() failed: %d\n",
> ret);
> - goto err_ialloc;
> + return ret;
> }
>
> ret = input_register_device(haptics->input_dev);
> if (ret < 0) {
> dev_err(arizona->dev, "couldn't register input device: %d\n",
> ret);
> - goto err_iff;
> + return ret;
> }
>
> platform_set_drvdata(pdev, haptics);
>
> return 0;
> -
> -err_iff:
> - if (haptics->input_dev)
> - input_ff_destroy(haptics->input_dev);
> -err_ialloc:
> - input_free_device(haptics->input_dev);
> -
> - return ret;
> -}
> -
> -static int arizona_haptics_remove(struct platform_device *pdev)
> -{
> - struct arizona_haptics *haptics = platform_get_drvdata(pdev);
> -
> - input_unregister_device(haptics->input_dev);
> -
> - return 0;
> }
>
> static struct platform_driver arizona_haptics_driver = {
> .probe = arizona_haptics_probe,
> - .remove = arizona_haptics_remove,
> .driver = {
> .name = "arizona-haptics",
> },
--
Dmitry
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Input: arizona-haptic - convert to use managed input devices
2015-07-17 23:28 ` Dmitry Torokhov
@ 2015-07-20 14:48 ` Joshua Clayton
0 siblings, 0 replies; 5+ messages in thread
From: Joshua Clayton @ 2015-07-20 14:48 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: linux-input, Mark Brown, linux-kernel
On Friday, July 17, 2015 04:28:34 PM Dmitry Torokhov wrote:
> On Mon, Jul 06, 2015 at 02:40:05PM -0700, Dmitry Torokhov wrote:
> > On Mon, Jul 06, 2015 at 12:33:06PM -0700, Joshua Clayton wrote:
> > > Hi,
> > > It seems to me that swapping error for ret buries the functional changes in
> > > the patch...
> > > would it be better to split them into a second cleanup patch?
> >
> > Fair enough, although I am not sure if I ever get to the renaming again
> >
>
> Joshua, does the below look OK to you?
>
> Thanks!
>
> >
> > Thanks.
> >
> > --
> > Dmitry
> >
> >
> > Input: arizona-haptic - convert to use managed input devices
> >
> > From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> >
> > Using managed input device (via devm_input_allocate_device) simplifies
> > error handling and driver removal paths and also silences CID# 712569.
> >
> > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> > ---
> > drivers/input/misc/arizona-haptics.c | 26 ++++----------------------
> > 1 file changed, 4 insertions(+), 22 deletions(-)
> >
> > diff --git a/drivers/input/misc/arizona-haptics.c b/drivers/input/misc/arizona-haptics.c
> > index 4dbbed7..4bf6785 100644
> > --- a/drivers/input/misc/arizona-haptics.c
> > +++ b/drivers/input/misc/arizona-haptics.c
> > @@ -170,8 +170,8 @@ static int arizona_haptics_probe(struct platform_device *pdev)
> >
> > INIT_WORK(&haptics->work, arizona_haptics_work);
> >
> > - haptics->input_dev = input_allocate_device();
> > - if (haptics->input_dev == NULL) {
> > + haptics->input_dev = devm_input_allocate_device(&pdev->dev);
> > + if (!haptics->input_dev) {
> > dev_err(arizona->dev, "Failed to allocate input device\n");
> > return -ENOMEM;
> > }
> > @@ -188,41 +188,23 @@ static int arizona_haptics_probe(struct platform_device *pdev)
> > if (ret < 0) {
> > dev_err(arizona->dev, "input_ff_create_memless() failed: %d\n",
> > ret);
> > - goto err_ialloc;
> > + return ret;
> > }
> >
> > ret = input_register_device(haptics->input_dev);
> > if (ret < 0) {
> > dev_err(arizona->dev, "couldn't register input device: %d\n",
> > ret);
> > - goto err_iff;
> > + return ret;
> > }
> >
> > platform_set_drvdata(pdev, haptics);
> >
> > return 0;
> > -
> > -err_iff:
> > - if (haptics->input_dev)
> > - input_ff_destroy(haptics->input_dev);
> > -err_ialloc:
> > - input_free_device(haptics->input_dev);
> > -
> > - return ret;
> > -}
> > -
> > -static int arizona_haptics_remove(struct platform_device *pdev)
> > -{
> > - struct arizona_haptics *haptics = platform_get_drvdata(pdev);
> > -
> > - input_unregister_device(haptics->input_dev);
> > -
> > - return 0;
> > }
> >
> > static struct platform_driver arizona_haptics_driver = {
> > .probe = arizona_haptics_probe,
> > - .remove = arizona_haptics_remove,
> > .driver = {
> > .name = "arizona-haptics",
> > },
>
> --
> Dmitry
devm for the win.
Yes, that looks good.
--
~Joshua Clayton
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-07-20 14:48 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-06 17:38 [PATCH] Input: arizona-haptic - convert to use managed input devices Dmitry Torokhov
2015-07-06 19:33 ` Joshua Clayton
2015-07-06 21:40 ` Dmitry Torokhov
2015-07-17 23:28 ` Dmitry Torokhov
2015-07-20 14:48 ` Joshua Clayton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).