diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-davinci/board-da850-evm.c | 2 | ||||
-rw-r--r-- | arch/cris/arch-v32/drivers/axisflashmap.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index 6659a90dbcad..8b079f9d6924 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c | |||
@@ -127,7 +127,7 @@ static void da850_evm_m25p80_notify_add(struct mtd_info *mtd) | |||
127 | size_t retlen; | 127 | size_t retlen; |
128 | 128 | ||
129 | if (!strcmp(mtd->name, "MAC-Address")) { | 129 | if (!strcmp(mtd->name, "MAC-Address")) { |
130 | mtd->read(mtd, 0, ETH_ALEN, &retlen, mac_addr); | 130 | mtd_read(mtd, 0, ETH_ALEN, &retlen, mac_addr); |
131 | if (retlen == ETH_ALEN) | 131 | if (retlen == ETH_ALEN) |
132 | pr_info("Read MAC addr from SPI Flash: %pM\n", | 132 | pr_info("Read MAC addr from SPI Flash: %pM\n", |
133 | mac_addr); | 133 | mac_addr); |
diff --git a/arch/cris/arch-v32/drivers/axisflashmap.c b/arch/cris/arch-v32/drivers/axisflashmap.c index a2bde3744622..011bddbf073f 100644 --- a/arch/cris/arch-v32/drivers/axisflashmap.c +++ b/arch/cris/arch-v32/drivers/axisflashmap.c | |||
@@ -413,8 +413,8 @@ static int __init init_axis_flash(void) | |||
413 | } while (blockstat && ptable_sector); | 413 | } while (blockstat && ptable_sector); |
414 | #endif | 414 | #endif |
415 | if (ptable_sector) { | 415 | if (ptable_sector) { |
416 | main_mtd->read(main_mtd, ptable_sector, PAGESIZE, | 416 | mtd_read(main_mtd, ptable_sector, PAGESIZE, &len, |
417 | &len, page); | 417 | page); |
418 | ptable_head = &((struct partitiontable *) page)->head; | 418 | ptable_head = &((struct partitiontable *) page)->head; |
419 | } | 419 | } |
420 | 420 | ||