Commit 3184125e authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Greg Kroah-Hartman

Input: gpio_keys - use devm_device_add_group() for attributes

Now that we have proper managed API to create device attributes, let's
start using it instead of the manual unwinding.
Signed-off-by: default avatarDmitry Torokhov <>
Reviewed-by: default avatarGuenter Roeck <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent 57b8ff07
......@@ -814,7 +814,7 @@ static int gpio_keys_probe(struct platform_device *pdev)
error = sysfs_create_group(&dev->kobj, &gpio_keys_attr_group);
error = devm_device_add_group(dev, &gpio_keys_attr_group);
if (error) {
dev_err(dev, "Unable to export keys/switches, error: %d\n",
......@@ -825,22 +825,11 @@ static int gpio_keys_probe(struct platform_device *pdev)
if (error) {
dev_err(dev, "Unable to register input device, error: %d\n",
goto err_remove_group;
return error;
device_init_wakeup(dev, wakeup);
return 0;
sysfs_remove_group(&dev->kobj, &gpio_keys_attr_group);
return error;
static int gpio_keys_remove(struct platform_device *pdev)
sysfs_remove_group(&pdev->dev.kobj, &gpio_keys_attr_group);
return 0;
......@@ -897,7 +886,6 @@ static SIMPLE_DEV_PM_OPS(gpio_keys_pm_ops, gpio_keys_suspend, gpio_keys_resume);
static struct platform_driver gpio_keys_device_driver = {
.probe = gpio_keys_probe,
.remove = gpio_keys_remove,
.driver = {
.name = "gpio-keys",
.pm = &gpio_keys_pm_ops,
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment