Skip to content

Commit 528c7d0

Browse files
committed
Input: rb532_button - switch to using managed resources
Using devm API allows us to clean up error handling paths and drop the remove() method. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Dmitry Torokhov <[email protected]>
1 parent aede7a1 commit 528c7d0

File tree

1 file changed

+2
-18
lines changed

1 file changed

+2
-18
lines changed

drivers/input/misc/rb532_button.c

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ static int rb532_button_probe(struct platform_device *pdev)
5858
struct input_polled_dev *poll_dev;
5959
int error;
6060

61-
poll_dev = input_allocate_polled_device();
61+
poll_dev = devm_input_allocate_polled_device(&pdev->dev);
6262
if (!poll_dev)
6363
return -ENOMEM;
6464

@@ -68,34 +68,18 @@ static int rb532_button_probe(struct platform_device *pdev)
6868
poll_dev->input->name = "rb532 button";
6969
poll_dev->input->phys = "rb532/button0";
7070
poll_dev->input->id.bustype = BUS_HOST;
71-
poll_dev->input->dev.parent = &pdev->dev;
72-
73-
dev_set_drvdata(&pdev->dev, poll_dev);
7471

7572
input_set_capability(poll_dev->input, EV_KEY, RB532_BTN_KSYM);
7673

7774
error = input_register_polled_device(poll_dev);
78-
if (error) {
79-
input_free_polled_device(poll_dev);
75+
if (error)
8076
return error;
81-
}
82-
83-
return 0;
84-
}
85-
86-
static int rb532_button_remove(struct platform_device *pdev)
87-
{
88-
struct input_polled_dev *poll_dev = dev_get_drvdata(&pdev->dev);
89-
90-
input_unregister_polled_device(poll_dev);
91-
input_free_polled_device(poll_dev);
9277

9378
return 0;
9479
}
9580

9681
static struct platform_driver rb532_button_driver = {
9782
.probe = rb532_button_probe,
98-
.remove = rb532_button_remove,
9983
.driver = {
10084
.name = DRV_NAME,
10185
},

0 commit comments

Comments
 (0)