gpio: linux-next fixes for sysfs support
PATCH 1/1 gpio: linux-next fixes for sysfs support
Cope with some backwards-incompatible driver model API changes now in the linux-next tree:
- device_create() is going away, even for drivers using it safely, in favor of device_create_drvdata().
- class->devices is gone, but testing class->p serves the same purpose (non-null when class is usable with driver model calls).
- class_find_device() needs a new argument #2 (NULL)
Signed-off-by David Brownell <[email protected]>
--- drivers/gpio/gpiolib.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/gpio/gpiolib.c +7 -9
@@ -429,7 +429,7 @@ int gpio_export(unsigned gpio, bool direint status = -EINVAL ;/* can't export until sysfs is available ... */ -if (!gpio_class.devices.next) { +if (!gpio_class.p) {pr_debug ("%s: called too early!\n" , __func__);return -ENOENT ; }
@@ -453,10 +453,9 @@ int gpio_export(unsigned gpio, bool direif (status ==0 ) {struct device *dev; - dev =device_create (&gpio_class, desc->chip->dev,0 , -"gpio%d" , gpio); + dev =device_create_drvdata (&gpio_class, desc->chip->dev,0 , + desc,"gpio%d" , gpio);if (dev) { -dev_set_drvdata (dev, desc);if (direction_may_change) status =sysfs_create_group (&dev->kobj, &gpio_attr_group);
@@ -506,7 +505,7 @@ void gpio_unexport(unsigned gpio)if (test_bit (FLAG_EXPORT , &desc->flags)) {struct device *dev =NULL ; - dev =class_find_device (&gpio_class, desc, match_export); + dev =class_find_device (&gpio_class,NULL , desc, match_export);if (dev) {clear_bit (FLAG_EXPORT , &desc->flags);put_device (dev);
@@ -533,15 +532,14 @@ static int gpiochip_export(struct gpio_c* export this later, in gpiolib_sysfs_init() ... here we just * verify that _some_ field of gpio_class got initialized. */ -if (!gpio_class.devices.next) +if (!gpio_class.p)return 0 ;/* use chip->base for the ID; it's already known to be unique */ mutex_lock (&sysfs_lock); - dev =device_create (&gpio_class, chip->dev,0 , + dev =device_create_drvdata (&gpio_class, chip->dev,0 , chip,"gpiochip%d" , chip->base);if (dev) { -dev_set_drvdata (dev, chip); status =sysfs_create_group (&dev->kobj, &gpiochip_attr_group); }else
@@ -572,7 +570,7 @@ static void gpiochip_unexport(struct gpistruct device *dev;mutex_lock (&sysfs_lock); - dev =class_find_device (&gpio_class, chip, match_export); + dev =class_find_device (&gpio_class,NULL , chip, match_export);if (dev) {put_device (dev);device_unregister (dev);