Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757348AbYKLXmy (ORCPT ); Wed, 12 Nov 2008 18:42:54 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757383AbYKLXjw (ORCPT ); Wed, 12 Nov 2008 18:39:52 -0500 Received: from smtp.gentoo.org ([140.211.166.183]:58712 "EHLO smtp.gentoo.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757380AbYKLXjv (ORCPT ); Wed, 12 Nov 2008 18:39:51 -0500 From: Mike Frysinger To: linux-mtd@lists.infradead.org, David Woodhouse Cc: linux-kernel@vger.kernel.org Subject: [PATCH] mtd/bfin-async-flash: use parse_mtd() Date: Wed, 12 Nov 2008 18:39:49 -0500 Message-Id: <1226533189-8492-2-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 1.6.0.3 In-Reply-To: <1226533133-7405-1-git-send-email-vapier@gentoo.org> References: <1226533133-7405-1-git-send-email-vapier@gentoo.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2601 Lines: 71 Call parse_mtd() to handle partition/device registration rather than doing it all ourself. Signed-off-by: Mike Frysinger --- drivers/mtd/maps/bfin-async-flash.c | 28 +++------------------------- 1 files changed, 3 insertions(+), 25 deletions(-) diff --git a/drivers/mtd/maps/bfin-async-flash.c b/drivers/mtd/maps/bfin-async-flash.c index 6fec86a..01c9e7a 100644 --- a/drivers/mtd/maps/bfin-async-flash.c +++ b/drivers/mtd/maps/bfin-async-flash.c @@ -120,13 +120,8 @@ static void bfin_copy_to(struct map_info *map, unsigned long to, const void *fro switch_back(state); } -#ifdef CONFIG_MTD_PARTITIONS -static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", NULL }; -#endif - static int __devinit bfin_flash_probe(struct platform_device *pdev) { - int ret; struct physmap_flash_data *pdata = pdev->dev.platform_data; struct resource *memory = platform_get_resource(pdev, IORESOURCE_MEM, 0); struct resource *flash_ambctl = platform_get_resource(pdev, IORESOURCE_MEM, 1); @@ -150,6 +145,8 @@ static int __devinit bfin_flash_probe(struct platform_device *pdev) state->flash_ambctl0 = flash_ambctl->start; state->flash_ambctl1 = flash_ambctl->end; + platform_set_drvdata(pdev, state); + if (gpio_request(state->enet_flash_pin, DRIVER_NAME)) { pr_devinit(KERN_ERR DRIVER_NAME ": Failed to request gpio %d\n", state->enet_flash_pin); return -EBUSY; @@ -161,26 +158,7 @@ static int __devinit bfin_flash_probe(struct platform_device *pdev) if (!state->mtd) return -ENXIO; -#ifdef CONFIG_MTD_PARTITIONS - ret = parse_mtd_partitions(state->mtd, part_probe_types, &pdata->parts, 0); - if (ret > 0) { - pr_devinit(KERN_NOTICE DRIVER_NAME ": Using commandline partition definition\n"); - add_mtd_partitions(state->mtd, pdata->parts, ret); - - } else if (pdata->nr_parts) { - pr_devinit(KERN_NOTICE DRIVER_NAME ": Using board partition definition\n"); - add_mtd_partitions(state->mtd, pdata->parts, pdata->nr_parts); - - } else -#endif - { - pr_devinit(KERN_NOTICE DRIVER_NAME ": no partition info available, registering whole flash at once\n"); - add_mtd_device(state->mtd); - } - - platform_set_drvdata(pdev, state); - - return 0; + return parse_mtd(state->mtd, NULL, pdata->parts, pdata->nr_parts); } static int __devexit bfin_flash_remove(struct platform_device *pdev) -- 1.6.0.3 -- 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/