Merge tag 'for-linus-3.4' of git://git.infradead.org/mtd-2.6

[mv-sheeva.git] / drivers / net / ethernet / sfc / mtd.c

diff --git a/drivers/net/ethernet/sfc/mtd.c b/drivers/net/ethernet/sfc/mtd.c
index 26b3c23b0b6f263a72678675eadb8ff673be5f2c..758148379b0e19d34e0e413884649060efa9090f 100644 (file)
--- a/drivers/net/ethernet/sfc/mtd.c
+++ b/drivers/net/ethernet/sfc/mtd.c
@@ -193,7 +193,7 @@ static int efx_mtd_erase(struct mtd_info *mtd, struct erase_info *erase)
                erase->state = MTD_ERASE_DONE;
        } else {
                erase->state = MTD_ERASE_FAILED;
-               erase->fail_addr = 0xffffffff;
+               erase->fail_addr = MTD_FAIL_ADDR_UNKNOWN;
        }
        mtd_erase_callback(erase);
        return rc;
@@ -263,10 +263,10 @@ static int efx_mtd_probe_device(struct efx_nic *efx, struct efx_mtd *efx_mtd)
                part->mtd.owner = THIS_MODULE;
                part->mtd.priv = efx_mtd;
                part->mtd.name = part->name;
-               part->mtd.erase = efx_mtd_erase;
-               part->mtd.read = efx_mtd->ops->read;
-               part->mtd.write = efx_mtd->ops->write;
-               part->mtd.sync = efx_mtd_sync;
+               part->mtd._erase = efx_mtd_erase;
+               part->mtd._read = efx_mtd->ops->read;
+               part->mtd._write = efx_mtd->ops->write;
+               part->mtd._sync = efx_mtd_sync;
 
                if (mtd_device_register(&part->mtd, NULL, 0))
                        goto fail;