1 files changed, 8 insertions, 38 deletions

diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c
index 5fc198350b94..ab8a2f4c8d60 100644
--- a/drivers/mtd/devices/sst25l.c
+++ b/drivers/mtd/devices/sst25l.c
@@ -175,9 +175,6 @@ static int sst25l_erase(struct mtd_info *mtd, struct erase_info *instr)
         int err;
 
         /* Sanity checks */
-        if (instr->addr + instr->len > flash->mtd.size)
-                return -EINVAL;
-
         if ((uint32_t)instr->len % mtd->erasesize)
                 return -EINVAL;
 
@@ -223,16 +220,6 @@ static int sst25l_read(struct mtd_info *mtd, loff_t from, size_t len,
         unsigned char command[4];
         int ret;
 
-        /* Sanity checking */
-        if (len == 0)
-                return 0;
-
-        if (from + len > flash->mtd.size)
-                return -EINVAL;
-
-        if (retlen)
-                *retlen = 0;
-
         spi_message_init(&message);
         memset(&transfer, 0, sizeof(transfer));
 
@@ -274,13 +261,6 @@ static int sst25l_write(struct mtd_info *mtd, loff_t to, size_t len,
         int i, j, ret, bytes, copied = 0;
         unsigned char command[5];
 
-        /* Sanity checks */
-        if (!len)
-                return 0;
-
-        if (to + len > flash->mtd.size)
-                return -EINVAL;
-
         if ((uint32_t)to % mtd->writesize)
                 return -EINVAL;
 
@@ -402,10 +382,11 @@ static int __devinit sst25l_probe(struct spi_device *spi)
         flash->mtd.flags        = MTD_CAP_NORFLASH;
         flash->mtd.erasesize    = flash_info->erase_size;
         flash->mtd.writesize    = flash_info->page_size;
+        flash->mtd.writebufsize = flash_info->page_size;
         flash->mtd.size         = flash_info->page_size * flash_info->nr_pages;
-        flash->mtd.erase        = sst25l_erase;
-        flash->mtd.read         = sst25l_read;
-        flash->mtd.write        = sst25l_write;
+        flash->mtd._erase       = sst25l_erase;
+        flash->mtd._read                = sst25l_read;
+        flash->mtd._write       = sst25l_write;
 
         dev_info(&spi->dev, "%s (%lld KiB)\n", flash_info->name,
                  (long long)flash->mtd.size >> 10);
@@ -418,9 +399,9 @@ static int __devinit sst25l_probe(struct spi_device *spi)
               flash->mtd.numeraseregions);
 
 
-        ret = mtd_device_parse_register(&flash->mtd, NULL, 0,
-                        data ? data->parts : NULL,
-                        data ? data->nr_parts : 0);
+        ret = mtd_device_parse_register(&flash->mtd, NULL, NULL,
+                                        data ? data->parts : NULL,
+                                        data ? data->nr_parts : 0);
         if (ret) {
                 kfree(flash);
                 dev_set_drvdata(&spi->dev, NULL);
@@ -450,18 +431,7 @@ static struct spi_driver sst25l_driver = {
         .remove         = __devexit_p(sst25l_remove),
 };
 
-static int __init sst25l_init(void)
-{
-        return spi_register_driver(&sst25l_driver);
-}
-
-static void __exit sst25l_exit(void)
-{
-        spi_unregister_driver(&sst25l_driver);
-}
-
-module_init(sst25l_init);
-module_exit(sst25l_exit);
+module_spi_driver(sst25l_driver);
 
 MODULE_DESCRIPTION("MTD SPI driver for SST25L Flash chips");
 MODULE_AUTHOR("Andre Renaud <andre@bluewatersys.com>, "