diff options
| author |   Guenter Roeck <linux@roeck-us.net> | 2017-01-18 11:36:25 -0800 |
|---|---|---|
| committer |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-01-18 11:49:11 -0800 |
| commit | 0265c324b8a2bbe502fee3007361d310de3b6d0c (patch) | |
| tree | 217345b048992a4ce1f78aee4694af10078d3245 /drivers/input/misc/bfin_rotary.c | |
| parent | Input: eeti_ts - drop goto to return statement (diff) | |
| download | linux-dev-0265c324b8a2bbe502fee3007361d310de3b6d0c.tar.xz linux-dev-0265c324b8a2bbe502fee3007361d310de3b6d0c.zip | |
Input: bfin_rotary - switch to using devm_add_action_or_reset()
Use local variable 'dev' instead of dereferencing it several times and
replace devm_add_action() and manual error handling with
devm_add_action_or_reset().
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/misc/bfin_rotary.c')
| -rw-r--r-- | drivers/input/misc/bfin_rotary.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/input/misc/bfin_rotary.c b/drivers/input/misc/bfin_rotary.c index a0fc18fdfc0c..799ce3d2820e 100644 --- a/drivers/input/misc/bfin_rotary.c +++ b/drivers/input/misc/bfin_rotary.c @@ -147,19 +147,18 @@ static int bfin_rotary_probe(struct platform_device *pdev) if (pdata->pin_list) { error = peripheral_request_list(pdata->pin_list, - dev_name(&pdev->dev)); + dev_name(dev)); if (error) { dev_err(dev, "requesting peripherals failed: %d\n", error); return error; } - error = devm_add_action(dev, bfin_rotary_free_action, - pdata->pin_list); + error = devm_add_action_or_reset(dev, bfin_rotary_free_action, + pdata->pin_list); if (error) { dev_err(dev, "setting cleanup action failed: %d\n", error); - peripheral_free_list(pdata->pin_list); return error; } } @@ -189,7 +188,7 @@ static int bfin_rotary_probe(struct platform_device *pdev) input->name = pdev->name; input->phys = "bfin-rotary/input0"; - input->dev.parent = &pdev->dev; + input->dev.parent = dev; input_set_drvdata(input, rotary); @@ -239,7 +238,7 @@ static int bfin_rotary_probe(struct platform_device *pdev) } platform_set_drvdata(pdev, rotary); - device_init_wakeup(&pdev->dev, 1); + device_init_wakeup(dev, 1); return 0; } |