From: Mike Frysinger <vapier@gentoo.org>
To: linux-mtd@lists.infradead.org, David Woodhouse <dwmw2@infradead.org>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] mtd/bfin-async-flash: use parse_mtd()
Date: Wed, 12 Nov 2008 18:39:49 -0500 [thread overview]
Message-ID: <1226533189-8492-2-git-send-email-vapier@gentoo.org> (raw)
In-Reply-To: <1226533133-7405-1-git-send-email-vapier@gentoo.org>
Call parse_mtd() to handle partition/device registration rather than doing
it all ourself.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
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
next prev parent reply other threads:[~2008-11-12 23:42 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-12 23:38 [PATCH] mtd: unify mtd partition/device registration Mike Frysinger
2008-11-12 23:39 ` [PATCH] mtd/physmap: use parse_mtd() Mike Frysinger
2008-11-13 13:51 ` Atsushi Nemoto
2008-11-13 14:44 ` Mike Frysinger
2008-11-14 21:41 ` Andrew Morton
2008-11-14 22:07 ` Mike Frysinger
2008-11-12 23:39 ` Mike Frysinger [this message]
2008-11-13 13:43 ` [PATCH] mtd: unify mtd partition/device registration Atsushi Nemoto
2008-11-13 14:28 ` Atsushi Nemoto
2008-11-13 14:51 ` Mike Frysinger
2008-11-13 15:51 ` Atsushi Nemoto
2008-11-13 15:55 ` Mike Frysinger
2008-11-13 14:47 ` Mike Frysinger
2008-11-14 21:39 ` Andrew Morton
2008-11-16 17:34 ` Jörn Engel
2008-11-16 17:55 ` Mike Frysinger
2008-11-16 18:02 ` Jörn Engel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1226533189-8492-2-git-send-email-vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=dwmw2@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®