public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] gpiommc: Fix for configfs API change
@ 2008-07-21 10:25 Michael Buesch
  0 siblings, 0 replies; only message in thread
From: Michael Buesch @ 2008-07-21 10:25 UTC (permalink / raw)
  To: Andrew Morton, Stephen Rothwell; +Cc: linux-kernel, openwrt-devel

The configfs API changed in linux-next. This patch fixes gpiommc
to use the new API. This fixes a compiler warning.

Signed-off-by: Michael Buesch <mb@bu3sch.de>

---

Warning remained unoticed when porting the stuff from 2.6.25 to linux-next.

Index: linux-next/drivers/mmc/host/gpiommc.c
===================================================================
--- linux-next.orig/drivers/mmc/host/gpiommc.c	2008-07-21 12:10:55.000000000 +0200
+++ linux-next/drivers/mmc/host/gpiommc.c	2008-07-21 12:17:36.000000000 +0200
@@ -509,19 +509,20 @@ static struct config_item_type gpiommc_d
 	.ct_owner	= THIS_MODULE,
 };
 
-static struct config_item *gpiommc_make_item(struct config_group *group,
-					     const char *name)
+static int gpiommc_make_item(struct config_group *group,
+			     const char *name,
+			     struct config_item **new_item)
 {
 	struct gpiommc_configfs_device *dev;
 
 	if (strlen(name) > GPIOMMC_MAX_NAMELEN) {
 		printk(KERN_ERR PFX "configfs: device name too long\n");
-		return NULL;
+		return -E2BIG;
 	}
 
 	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
 	if (!dev)
-		return NULL;
+		return -ENOMEM;
 
 	mutex_init(&dev->mutex);
 	config_item_init_type_name(&dev->item, name,
@@ -537,7 +538,9 @@ static struct config_item *gpiommc_make_
 	dev->pdata.no_spi_delay = 0;
 	dev->pdata.max_bus_speed = 5000000; /* 5 MHz */
 
-	return &(dev->item);
+	*new_item = &(dev->item);
+
+	return 0;
 }
 
 static void gpiommc_drop_item(struct config_group *group,

-- 
Greetings Michael.

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-07-21 10:27 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-07-21 10:25 [PATCH] gpiommc: Fix for configfs API change Michael Buesch

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox