From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wy0-f177.google.com ([74.125.82.177]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QOXnT-0007Gq-2A for linux-mtd@lists.infradead.org; Mon, 23 May 2011 16:16:00 +0000 Received: by wyb28 with SMTP id 28so5456362wyb.36 for ; Mon, 23 May 2011 09:15:56 -0700 (PDT) From: Jamie Iles To: linux-mtd@lists.infradead.org Subject: [PATCHv2] mtd: introduce mtd_device_(un)register() Date: Mon, 23 May 2011 17:15:46 +0100 Message-Id: <1306167346-6573-1-git-send-email-jamie@jamieiles.com> In-Reply-To: <1306163824.2785.39.camel@localhost> References: <1306163824.2785.39.camel@localhost> Cc: Jamie Iles , David Woodhouse , Artem Bityutskiy List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To prepare for the removal of add_mtd_device and add_mtd_partitions(), introduce mtd_device_register(). This will create partitions if they are supplied or register the whole device if there are no partitions. Once all drivers are converted to use mtd_device_register(), add_mtd_device() and add_mtd_partitions() will be made internal only. v2: move kerneldoc to implementation file and fixup some kerneldoc warnings. Cc: David Woodhouse Cc: Artem Bityutskiy Signed-off-by: Jamie Iles --- drivers/mtd/mtdcore.c | 45 ++++++++++++++++++++++++++++++++++++++++ include/linux/mtd/mtd.h | 6 +++++ include/linux/mtd/partitions.h | 2 +- 3 files changed, 52 insertions(+), 1 deletions(-) diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index da69bc8..7818ee6 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -37,6 +37,7 @@ #include #include +#include #include "mtdcore.h" /* @@ -427,6 +428,50 @@ out_error: } /** + * 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_unregister() - unregister an existing MTD device. + * + * @master: The MTD device to unregister. This will unregister both the + * master and any partitions if registered. + */ +int mtd_device_unregister(struct mtd_info *master) +{ + int err; + + err = del_mtd_partitions(master); + if (err) + return err; + + if (!device_is_registered(&master->dev)) + return 0; + + return del_mtd_device(master); +} +EXPORT_SYMBOL_GPL(mtd_device_unregister); + +/** * register_mtd_user - register a 'user' of MTD devices. * @new: pointer to notifier info structure * diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 9d5306b..a08dd14 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -325,6 +325,12 @@ static inline uint32_t mtd_mod_by_ws(uint64_t sz, struct mtd_info *mtd) extern int add_mtd_device(struct mtd_info *mtd); extern int del_mtd_device (struct mtd_info *mtd); +struct mtd_partition; + +extern int mtd_device_register(struct mtd_info *master, + const struct mtd_partition *parts, + int 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); extern void __put_mtd_device(struct mtd_info *mtd); diff --git a/include/linux/mtd/partitions.h b/include/linux/mtd/partitions.h index 4a0a8ba..998a6cf 100644 --- a/include/linux/mtd/partitions.h +++ b/include/linux/mtd/partitions.h @@ -16,7 +16,7 @@ * Partition definition structure: * * An array of struct partition is passed along with a MTD object to - * add_mtd_partitions() to create them. + * mtd_device_register() to create them. * * For each partition, these fields are available: * name: string that will be used to label the partition's MTD device. -- 1.7.4.1