openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

gpiolib: utilize new cdev_device_add helper function 

Replace the open coded registration of the cdev and dev with the
new device_add_cdev() helper. The helper replaces a common pattern by
taking the proper reference against the parent device and adding both
the cdev and the device.

Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Logan Gunthorpe 2017-03-17 12:48:12 -06:00 committed by Greg Kroah-Hartman
parent 358a89ca2c
commit 111379dccc
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/gpio/gpiolib.c
View File

@ -1035,18 +1035,14 @@ static int gpiochip_setup_dev(struct gpio_device *gdev)
cdev_init(&gdev->chrdev, &gpio_fileops); cdev_init(&gdev->chrdev, &gpio_fileops);
gdev->chrdev.owner = THIS_MODULE; gdev->chrdev.owner = THIS_MODULE;
gdev->chrdev.kobj.parent = &gdev->dev.kobj;
gdev->dev.devt = MKDEV(MAJOR(gpio_devt), gdev->id); gdev->dev.devt = MKDEV(MAJOR(gpio_devt), gdev->id);
status = cdev_add(&gdev->chrdev, gdev->dev.devt, 1);
if (status < 0) status = cdev_device_add(&gdev->chrdev, &gdev->dev);
chip_warn(gdev->chip, "failed to add char device %d:%d\n", if (status)
MAJOR(gpio_devt), gdev->id); return status;
else
chip_dbg(gdev->chip, "added GPIO chardev (%d:%d)\n", chip_dbg(gdev->chip, "added GPIO chardev (%d:%d)\n",
MAJOR(gpio_devt), gdev->id); MAJOR(gpio_devt), gdev->id);
status = device_add(&gdev->dev);
if (status)
goto err_remove_chardev;
status = gpiochip_sysfs_register(gdev); status = gpiochip_sysfs_register(gdev);
if (status) if (status)
@ -1061,9 +1057,7 @@ static int gpiochip_setup_dev(struct gpio_device *gdev)
return 0; return 0;
err_remove_device: err_remove_device:
device_del(&gdev->dev); cdev_device_del(&gdev->chrdev, &gdev->dev);
err_remove_chardev:
cdev_del(&gdev->chrdev);
return status; return status;
} }
@ -1347,8 +1341,7 @@ void gpiochip_remove(struct gpio_chip *chip)
* be removed, else it will be dangling until the last user is * be removed, else it will be dangling until the last user is
* gone. * gone.
*/ */
cdev_del(&gdev->chrdev); cdev_device_del(&gdev->chrdev, &gdev->dev);
device_del(&gdev->dev);
put_device(&gdev->dev); put_device(&gdev->dev);
} }
EXPORT_SYMBOL_GPL(gpiochip_remove); EXPORT_SYMBOL_GPL(gpiochip_remove);