[<prev] [next>] [day] [month] [year] [list]
Message-Id: <200807211225.31834.mb@bu3sch.de>
Date: Mon, 21 Jul 2008 12:25:31 +0200
From: Michael Buesch <mb@...sch.de>
To: Andrew Morton <akpm@...ux-foundation.org>,
Stephen Rothwell <sfr@...b.auug.org.au>
Cc: "linux-kernel" <linux-kernel@...r.kernel.org>,
openwrt-devel@...ts.openwrt.org
Subject: [PATCH] gpiommc: Fix for configfs API change
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@...sch.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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists