Merge remote-tracking branch 'spi/for-next'

[karo-tx-linux.git] / drivers / mtd / devices / sst25l.c

diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c
index 687bf27ec85076c2d735418714c12c537c2dc498..5b84d71efb3642f179b5128ae2d4c6c76a4cdc31 100644 (file)
--- a/drivers/mtd/devices/sst25l.c
+++ b/drivers/mtd/devices/sst25l.c
@@ -15,7 +15,6 @@
  *
  */
 
-#include <linux/init.h>
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/mutex.h>
@@ -375,9 +374,8 @@ static int sst25l_probe(struct spi_device *spi)
        data = dev_get_platdata(&spi->dev);
        if (data && data->name)
                flash->mtd.name = data->name;
-       else
-               flash->mtd.name = dev_name(&spi->dev);
 
+       flash->mtd.dev.parent   = &spi->dev;
        flash->mtd.type         = MTD_NORFLASH;
        flash->mtd.flags        = MTD_CAP_NORFLASH;
        flash->mtd.erasesize    = flash_info->erase_size;
@@ -418,7 +416,6 @@ static int sst25l_remove(struct spi_device *spi)
 static struct spi_driver sst25l_driver = {
        .driver = {
                .name   = "sst25l",
-               .owner  = THIS_MODULE,
        },
        .probe          = sst25l_probe,
        .remove         = sst25l_remove,