Re: [patch 2.6.26-rc5] gpio: sysfs interface (updated)



On Tue, 22 Jul 2008 16:28:24 -0700
Greg KH <greg@xxxxxxxxx> wrote:

On Tue, Jul 22, 2008 at 04:27:51PM -0700, Andrew Morton wrote:
On Thu, 12 Jun 2008 11:53:36 -0700
David Brownell <david-b@xxxxxxxxxxx> wrote:

This adds a simple sysfs interface for GPIOs.

device_create_drvdata() has magically vanished from today's linux-next,
so this code doesn't compile any more.

This:

--- a/drivers/gpio/gpiolib.c~gpio-sysfs-interface-updated-gpio-linux-next-fixes-for-sysfs-support-fix
+++ a/drivers/gpio/gpiolib.c
@@ -453,8 +453,8 @@ int gpio_export(unsigned gpio, bool dire
if (status == 0) {
struct device *dev;

- dev = device_create_drvdata(&gpio_class, desc->chip->dev, 0,
- desc, "gpio%d", gpio);
+ dev = device_create(&gpio_class, desc->chip->dev, 0, desc,
+ "gpio%d", gpio);

Should be NULL instead of 0 there, otherwise sparse will complain.


if (dev) {
if (direction_may_change)
status = sysfs_create_group(&dev->kobj,
@@ -537,8 +537,8 @@ static int gpiochip_export(struct gpio_c

/* use chip->base for the ID; it's already known to be unique */
mutex_lock(&sysfs_lock);
- dev = device_create_drvdata(&gpio_class, chip->dev, 0, chip,
- "gpiochip%d", chip->base);
+ dev = device_create(&gpio_class, chip->dev, 0, chip, "gpiochip%d",
+ chip->base);

Same here.


And is this change safe to merge into mainline? Or should it wait
until device_create_drvdata-removal and any associated stuff has
merged?

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



Relevant Pages

  • Re: [patch 2.6.26-rc5] gpio: sysfs interface (updated)
    ... Greg KH wrote: ... device_create_drvdatahas magically vanished from today's linux-next, ... so this code doesn't compile any more. ... Please read the FAQ at http://www.tux.org/lkml/ ...
    (Linux-Kernel)
  • Re: [patch 2.6.26-rc5] gpio: sysfs interface (updated)
    ... Greg KH wrote: ... so this code doesn't compile any more. ... Should be NULL instead of 0 there, otherwise sparse will complain. ... Please read the FAQ at http://www.tux.org/lkml/ ...
    (Linux-Kernel)
  • Re: [patch 2.6.26-rc5] gpio: sysfs interface (updated)
    ... device_create_drvdatahas magically vanished from today's linux-next, ... so this code doesn't compile any more. ... Should be NULL instead of 0 there, otherwise sparse will complain. ... Please read the FAQ at http://www.tux.org/lkml/ ...
    (Linux-Kernel)
  • Re: [patch 2.6.26-rc5] gpio: sysfs interface (updated)
    ... Greg KH wrote: ... device_create_drvdatahas magically vanished from today's linux-next, ... so this code doesn't compile any more. ... Please read the FAQ at http://www.tux.org/lkml/ ...
    (Linux-Kernel)
  • Re: linux-next: Tree for November 23
    ... Greg KH wrote: ... linux-next to do -staging development on. ... More majordomo info at http://vger.kernel.org/majordomo-info.html ... Please read the FAQ at http://www.tux.org/lkml/ ...
    (Linux-Kernel)