Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2f90941 authored by David Daney's avatar David Daney Committed by Ralf Baechle
Browse files

MIPS: Octeon: Fix compile error in arch/mips/cavium-octeon/flash_setup.c 



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

Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2923/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 54b2edf4

arch/mips/cavium-octeon/flash_setup.c

+2 −7
Original line number Diff line number Diff line
@@ -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");

		}