4 files changed, 4 insertions, 17 deletions

diff --git a/drivers/mtd/devices/Makefile b/drivers/mtd/devices/Makefile
index ab5c9b92ac82..f3226b1d38fc 100644
--- a/drivers/mtd/devices/Makefile
+++ b/drivers/mtd/devices/Makefile
@@ -1,5 +1,5 @@
 #
-# linux/drivers/devices/Makefile
+# linux/drivers/mtd/devices/Makefile
 #
 
 obj-$(CONFIG_MTD_DOC2000)       += doc2000.o
diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c
index ce6424008ed9..93651865ddbe 100644
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
@@ -276,12 +276,10 @@ static struct block2mtd_dev *add_device(char *devname, int erase_size)
 
         /* Setup the MTD structure */
         /* make the name contain the block device in */
-        name = kmalloc(sizeof("block2mtd: ") + strlen(devname) + 1,
-                        GFP_KERNEL);
+        name = kasprintf(GFP_KERNEL, "block2mtd: %s", devname);
         if (!name)
                 goto devinit_err;
 
-        sprintf(name, "block2mtd: %s", devname);
         dev->mtd.name = name;
 
         dev->mtd.size = dev->blkdev->bd_inode->i_size & PAGE_MASK;
diff --git a/drivers/mtd/devices/pmc551.c b/drivers/mtd/devices/pmc551.c
index d2fd550f7e09..fc8ea0a57ac2 100644
--- a/drivers/mtd/devices/pmc551.c
+++ b/drivers/mtd/devices/pmc551.c
@@ -668,7 +668,7 @@ static int __init init_pmc551(void)
 {
         struct pci_dev *PCI_Device = NULL;
         struct mypriv *priv;
-        int count, found = 0;
+        int found = 0;
         struct mtd_info *mtd;
         u32 length = 0;
 
@@ -695,7 +695,7 @@ static int __init init_pmc551(void)
         /*
          * PCU-bus chipset probe.
          */
-        for (count = 0; count < MAX_MTD_DEVICES; count++) {
+        for (;;) {
 
                 if ((PCI_Device = pci_get_device(PCI_VENDOR_ID_V3_SEMI,
                                                   PCI_DEVICE_ID_V3_SEMI_V370PDC,
diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c
index fe17054ee2fe..bcf040beb835 100644
--- a/drivers/mtd/devices/sst25l.c
+++ b/drivers/mtd/devices/sst25l.c
@@ -411,17 +411,6 @@ static int __init sst25l_probe(struct spi_device *spi)
               flash->mtd.erasesize, flash->mtd.erasesize / 1024,
               flash->mtd.numeraseregions);
 
-        if (flash->mtd.numeraseregions)
-                for (i = 0; i < flash->mtd.numeraseregions; i++)
-                        DEBUG(MTD_DEBUG_LEVEL2,
-                              "mtd.eraseregions[%d] = { .offset = 0x%llx, "
-                              ".erasesize = 0x%.8x (%uKiB), "
-                              ".numblocks = %d }\n",
-                              i, (long long)flash->mtd.eraseregions[i].offset,
-                              flash->mtd.eraseregions[i].erasesize,
-                              flash->mtd.eraseregions[i].erasesize / 1024,
-                              flash->mtd.eraseregions[i].numblocks);
-
         if (mtd_has_partitions()) {
                 struct mtd_partition *parts = NULL;
                 int nr_parts = 0;