The patch titled
gpiommc: fix for configfs API change
has been removed from the -mm tree. Its filename was
mmc-add-gpio-based-mmc-sd-driver-v3-fix-for-configfs-api-change.patch
This patch was dropped because it was folded into mmc-add-gpio-based-mmc-sd-driver.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: gpiommc: fix for configfs API change
From: Michael Buesch <mb@xxxxxxxxx>
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@xxxxxxxxx>
Cc: David Brownell <david-b@xxxxxxxxxxx>
Cc: Pierre Ossman <drzeus-list@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/mmc/host/gpiommc.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff -puN drivers/mmc/host/gpiommc.c~mmc-add-gpio-based-mmc-sd-driver-v3-fix-for-configfs-api-change drivers/mmc/host/gpiommc.c
--- a/drivers/mmc/host/gpiommc.c~mmc-add-gpio-based-mmc-sd-driver-v3-fix-for-configfs-api-change
+++ a/drivers/mmc/host/gpiommc.c
@@ -499,19 +499,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;
config_item_init_type_name(&dev->item, name,
&gpiommc_dev_ci_type);
@@ -526,7 +527,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,
_
Patches currently in -mm which might be from mb@xxxxxxxxx are
origin.patch
spi-add-spi-over-gpio-driver.patch
mmc-add-gpio-based-mmc-sd-driver.patch
mmc-add-gpio-based-mmc-sd-driver-v3-fix-for-configfs-api-change.patch
mmc-add-gpio-based-mmc-sd-driver-add-documentation-abi-testing-configfs-gpiommc.patch
mmc-add-gpio-based-mmc-sd-driver-add-locking.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
