All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] MIPS: Octeon: Fix compile error in arch/mips/cavium-octeon/flash_setup.c
@ 2011-11-09 23:13 David Daney
  2011-11-09 23:21 ` Ralf Baechle
  0 siblings, 1 reply; 2+ messages in thread
From: David Daney @ 2011-11-09 23:13 UTC (permalink / raw)
  To: linux-mips, ralf; +Cc: David Daney

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

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] MIPS: Octeon: Fix compile error in arch/mips/cavium-octeon/flash_setup.c
  2011-11-09 23:13 [PATCH] MIPS: Octeon: Fix compile error in arch/mips/cavium-octeon/flash_setup.c David Daney
@ 2011-11-09 23:21 ` Ralf Baechle
  0 siblings, 0 replies; 2+ messages in thread
From: Ralf Baechle @ 2011-11-09 23:21 UTC (permalink / raw)
  To: David Daney; +Cc: linux-mips

On Wed, Nov 09, 2011 at 03:13:16PM -0800, David Daney wrote:

> The parse_mtd_partitions() and mtd_device_register() functions were
> combined into mtd_device_parse_register().  So call that instead.

Thanks, applied.

  Ralf

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-11-09 23:21 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-09 23:13 [PATCH] MIPS: Octeon: Fix compile error in arch/mips/cavium-octeon/flash_setup.c David Daney
2011-11-09 23:21 ` Ralf Baechle

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.