Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757287AbYGVXjv (ORCPT ); Tue, 22 Jul 2008 19:39:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751958AbYGVXjl (ORCPT ); Tue, 22 Jul 2008 19:39:41 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:46668 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750951AbYGVXjk (ORCPT ); Tue, 22 Jul 2008 19:39:40 -0400 Date: Tue, 22 Jul 2008 16:39:24 -0700 From: Andrew Morton To: Greg KH Cc: david-b@pacbell.net, linux-kernel@vger.kernel.org, g.liakhovetski@pengutronix.de Subject: Re: [patch 2.6.26-rc5] gpio: sysfs interface (updated) Message-Id: <20080722163924.33e9ff84.akpm@linux-foundation.org> In-Reply-To: <20080722232824.GA22596@kroah.com> References: <200806121153.36557.david-b@pacbell.net> <20080722162751.e8584d46.akpm@linux-foundation.org> <20080722232824.GA22596@kroah.com> X-Mailer: Sylpheed version 2.2.4 (GTK+ 2.8.20; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1831 Lines: 52 On Tue, 22 Jul 2008 16:28:24 -0700 Greg KH 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 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/