From 2cc787bbdf4aba0f36905cedb606f5841bdea54c Mon Sep 17 00:00:00 2001 From: David Daney Date: Thu, 10 Nov 2011 17:59:45 +0000 Subject: [PATCH] --- yaml --- r: 275495 b: refs/heads/master c: b2f909419b72cf043814bf17b96c93d4695378a1 h: refs/heads/master i: 275493: 5d43a30f139de4c3884bc56400854bcfa1b77e6a 275491: c04545ed63e187274fae813f3febe34ab8e6be72 275487: e39b54106c57bf184aca3a41bb9fd36928d8ca46 v: v3 --- [refs] | 2 +- trunk/arch/mips/cavium-octeon/flash_setup.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 0f8c4055edcd..bfe158716e5a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54b2edf487d497cc522bce91b3bd79538f001d13 +refs/heads/master: b2f909419b72cf043814bf17b96c93d4695378a1 diff --git a/trunk/arch/mips/cavium-octeon/flash_setup.c b/trunk/arch/mips/cavium-octeon/flash_setup.c index 975c20327bb1..0a430e06f5e5 100644 --- a/trunk/arch/mips/cavium-octeon/flash_setup.c +++ b/trunk/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"); }