1 files changed, 8 insertions, 11 deletions

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 7c3fc766dcf1..8185b1f3e5e6 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -65,12 +65,6 @@
 #define FAST_READ_DUMMY_BYTE 0
 #endif
 
-#ifdef CONFIG_MTD_PARTITIONS
-#define mtd_has_partitions()    (1)
-#else
-#define mtd_has_partitions()    (0)
-#endif
-
 /****************************************************************************/
 
 struct m25p {
@@ -678,6 +672,8 @@ static int __devinit m25p_probe(struct spi_device *spi)
                 flash->mtd.erasesize = info->sector_size;
         }
 
+        flash->mtd.dev.parent = &spi->dev;
+
         dev_info(&spi->dev, "%s (%lld Kbytes)\n", info->name,
                         (long long)flash->mtd.size >> 10);
 
@@ -708,12 +704,13 @@ static int __devinit m25p_probe(struct spi_device *spi)
                 struct mtd_partition    *parts = NULL;
                 int                     nr_parts = 0;
 
-#ifdef CONFIG_MTD_CMDLINE_PARTS
-                static const char *part_probes[] = { "cmdlinepart", NULL, };
+                if (mtd_has_cmdlinepart()) {
+                        static const char *part_probes[]
+                                        = { "cmdlinepart", NULL, };
 
-                nr_parts = parse_mtd_partitions(&flash->mtd,
-                                part_probes, &parts, 0);
-#endif
+                        nr_parts = parse_mtd_partitions(&flash->mtd,
+                                        part_probes, &parts, 0);
+                }
 
                 if (nr_parts <= 0 && data && data->parts) {
                         parts = data->parts;