| To: | linux-mips@linux-mips.org, ralf@linux-mips.org |
|---|---|
| Subject: | [PATCH] MIPS: Octeon: Fix compile error in arch/mips/cavium-octeon/flash_setup.c |
| From: | David Daney <david.daney@cavium.com> |
| Date: | Wed, 9 Nov 2011 15:13:16 -0800 |
| Cc: | David Daney <david.daney@cavium.com> |
| Sender: | linux-mips-bounce@linux-mips.org |
The parse_mtd_partitions() and mtd_device_register() functions were
combined into mtd_device_parse_register(). So call that instead.
Signed-off-by: David Daney <david.daney@cavium.com>
---
arch/mips/cavium-octeon/flash_setup.c | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/arch/mips/cavium-octeon/flash_setup.c
b/arch/mips/cavium-octeon/flash_setup.c
index 975c203..0a430e0 100644
--- a/arch/mips/cavium-octeon/flash_setup.c
+++ b/arch/mips/cavium-octeon/flash_setup.c
@@ -17,8 +17,6 @@
static struct map_info flash_map;
static struct mtd_info *mymtd;
-static int nr_parts;
-static struct mtd_partition *parts;
static const char *part_probe_types[] = {
"cmdlinepart",
#ifdef CONFIG_MTD_REDBOOT_PARTS
@@ -61,11 +59,8 @@ static int __init flash_init(void)
mymtd = do_map_probe("cfi_probe", &flash_map);
if (mymtd) {
mymtd->owner = THIS_MODULE;
-
- nr_parts = parse_mtd_partitions(mymtd,
- part_probe_types,
- &parts, 0);
- mtd_device_register(mymtd, parts, nr_parts);
+ mtd_device_parse_register(mymtd, part_probe_types,
+ 0, NULL, 0);
} else {
pr_err("Failed to register MTD device for flash\n");
}
--
1.7.2.3
|
| <Prev in Thread] | Current Thread | [Next in Thread> |
|---|---|---|
| ||
| Previous by Date: | Re: [PATCH 1/4] MIPS/Perf-events: update the map of unsupported events for 74K, Peter Zijlstra |
|---|---|
| Next by Date: | Re: [PATCH] MIPS: Octeon: Fix compile error in arch/mips/cavium-octeon/flash_setup.c, Ralf Baechle |
| Previous by Thread: | Re: [PATCH 1/4] MIPS/Perf-events: update the map of unsupported events for 74K, Ralf Baechle |
| Next by Thread: | Re: [PATCH] MIPS: Octeon: Fix compile error in arch/mips/cavium-octeon/flash_setup.c, Ralf Baechle |
| Indexes: | [Date] [Thread] [Top] [All Lists] |