Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[karo-tx-linux.git] / drivers / mtd / nand / tmio_nand.c

diff --git a/drivers/mtd/nand/tmio_nand.c b/drivers/mtd/nand/tmio_nand.c
index 5aa518081c513454e0fedb70f907cdeffcbaecd2..396530d87ecfb824f5e7a4ede7a92e6c8f0d3a82 100644 (file)
--- a/drivers/mtd/nand/tmio_nand.c
+++ b/drivers/mtd/nand/tmio_nand.c
@@ -256,18 +256,6 @@ static void tmio_nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
        tmio_ioread16_rep(tmio->fcr + FCR_DATA, buf, len >> 1);
 }
 
-static int
-tmio_nand_verify_buf(struct mtd_info *mtd, const u_char *buf, int len)
-{
-       struct tmio_nand *tmio = mtd_to_tmio(mtd);
-       u16                             *p = (u16 *) buf;
-
-       for (len >>= 1; len; len--)
-               if (*(p++) != tmio_ioread16(tmio->fcr + FCR_DATA))
-                       return -EFAULT;
-       return 0;
-}
-
 static void tmio_nand_enable_hwecc(struct mtd_info *mtd, int mode)
 {
        struct tmio_nand *tmio = mtd_to_tmio(mtd);
@@ -369,7 +357,7 @@ static void tmio_hw_stop(struct platform_device *dev, struct tmio_nand *tmio)
 
 static int tmio_probe(struct platform_device *dev)
 {
-       struct tmio_nand_data *data = dev->dev.platform_data;
+       struct tmio_nand_data *data = dev_get_platdata(&dev->dev);
        struct resource *fcr = platform_get_resource(dev,
                        IORESOURCE_MEM, 0);
        struct resource *ccr = platform_get_resource(dev,
@@ -424,7 +412,6 @@ static int tmio_probe(struct platform_device *dev)
        nand_chip->read_byte = tmio_nand_read_byte;
        nand_chip->write_buf = tmio_nand_write_buf;
        nand_chip->read_buf = tmio_nand_read_buf;
-       nand_chip->verify_buf = tmio_nand_verify_buf;
 
        /* set eccmode using hardware ECC */
        nand_chip->ecc.mode = NAND_ECC_HW;