hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: David Daney <david.daney@cavium.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/2923/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
David Daney 2011-11-10 17:59:45 +00:00 committed by Ralf Baechle
parent 54b2edf487
commit b2f909419b
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/mips/cavium-octeon/flash_setup.c
View File

@ -17,8 +17,6 @@
static struct map_info flash_map; static struct map_info flash_map;
static struct mtd_info *mymtd; static struct mtd_info *mymtd;
static int nr_parts;
static struct mtd_partition *parts;
static const char *part_probe_types[] = { static const char *part_probe_types[] = {
"cmdlinepart", "cmdlinepart",
#ifdef CONFIG_MTD_REDBOOT_PARTS #ifdef CONFIG_MTD_REDBOOT_PARTS
@ -61,11 +59,8 @@ static int __init flash_init(void)
mymtd = do_map_probe("cfi_probe", &flash_map); mymtd = do_map_probe("cfi_probe", &flash_map);
if (mymtd) { if (mymtd) {
mymtd->owner = THIS_MODULE; mymtd->owner = THIS_MODULE;
mtd_device_parse_register(mymtd, part_probe_types,
nr_parts = parse_mtd_partitions(mymtd, 0, NULL, 0);
part_probe_types,
&parts, 0);
mtd_device_register(mymtd, parts, nr_parts);
} else { } else {
pr_err("Failed to register MTD device for flash\n"); pr_err("Failed to register MTD device for flash\n");
} }