mtd: remove dead non-char logic

MTD used to allow compiling out character device support. This was
dropped in the following commit, but some of the accompanying logic was
never dropped:

  commit 660685d9d1b4730f0b5ca97fa95f272f99c63bce
  Author: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
  Date:   Thu Mar 14 13:27:40 2013 +0200

      mtd: merge mtdchar module with mtdcore

The weird logic was flagged by Coverity.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index c101517..4c61187 100644 (file)
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -105,12 +105,11 @@ static LIST_HEAD(mtd_notifiers);
  */
 static void mtd_release(struct device *dev)
 {
-       struct mtd_info __maybe_unused *mtd = dev_get_drvdata(dev);
+       struct mtd_info *mtd = dev_get_drvdata(dev);
        dev_t index = MTD_DEVT(mtd->index);
 
-       /* remove /dev/mtdXro node if needed */
-       if (index)
-               device_destroy(&mtd_class, index + 1);
+       /* remove /dev/mtdXro node */
+       device_destroy(&mtd_class, index + 1);
 }
 
 static int mtd_cls_suspend(struct device *dev, pm_message_t state)
@@ -442,10 +441,8 @@ int add_mtd_device(struct mtd_info *mtd)
        if (device_register(&mtd->dev) != 0)
                goto fail_added;
 
-       if (MTD_DEVT(i))
-               device_create(&mtd_class, mtd->dev.parent,
-                             MTD_DEVT(i) + 1,
-                             NULL, "mtd%dro", i);
+       device_create(&mtd_class, mtd->dev.parent, MTD_DEVT(i) + 1, NULL,
+                     "mtd%dro", i);
 
        pr_debug("mtd: Giving out device %d to %s\n", i, mtd->name);
        /* No need to get a refcount on the module containing