mtd: drop mtd_device_register

mtd_device_register() is a limited version of mtd_device_parse_register.
Replace it with macro calling mtd_device_parse_register().

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index e18639980f7a01e31e6d10ab1fae18ecc4f74ba1..f9cc2d2cb5cb18cb7249e1677b67c20876b058d8 100644 (file)
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -428,29 +428,6 @@ out_error:
        return ret;
 }
 
-/**
- * mtd_device_register - register an MTD device.
- *
- * @master: the MTD device to register
- * @parts: the partitions to register - only valid if nr_parts > 0
- * @nr_parts: the number of partitions in parts.  If zero then the full MTD
- *            device is registered
- *
- * Register an MTD device with the system and optionally, a number of
- * partitions.  If nr_parts is 0 then the whole device is registered, otherwise
- * only the partitions are registered.  To register both the full device *and*
- * the partitions, call mtd_device_register() twice, once with nr_parts == 0
- * and once equal to the number of partitions.
- */
-int mtd_device_register(struct mtd_info *master,
-                       const struct mtd_partition *parts,
-                       int nr_parts)
-{
-       return parts ? add_mtd_partitions(master, parts, nr_parts) :
-               add_mtd_device(master);
-}
-EXPORT_SYMBOL_GPL(mtd_device_register);
-
 /**
  * mtd_device_parse_register - parse partitions and register an MTD device.
  *

diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index b2b454b45cb59cdf2ef7ded924e20087c79ba90f..67774f9d57cc892b9ebd22dc3caf4682480d4534 100644 (file)
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -325,14 +325,13 @@ static inline uint32_t mtd_mod_by_ws(uint64_t sz, struct mtd_info *mtd)
 struct mtd_partition;
 struct mtd_part_parser_data;
 
-extern int mtd_device_register(struct mtd_info *master,
-                              const struct mtd_partition *parts,
-                              int nr_parts);
 extern int mtd_device_parse_register(struct mtd_info *mtd,
                              const char **part_probe_types,
                              struct mtd_part_parser_data *parser_data,
                              const struct mtd_partition *defparts,
                              int defnr_parts);
+#define mtd_device_register(master, parts, nr_parts)   \
+       mtd_device_parse_register(master, NULL, NULL, parts, nr_parts)
 extern int mtd_device_unregister(struct mtd_info *master);
 extern struct mtd_info *get_mtd_device(struct mtd_info *mtd, int num);
 extern int __get_mtd_device(struct mtd_info *mtd);