From 74d00a8c3849c1340efd713eb94b786e304c201f Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sun, 25 Dec 2016 20:11:34 +0100 Subject: kernel: split patches folder up into backport, pending and hack folders * properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin --- ...titions-add-helper-for-deleting-partition.patch | 119 --------------------- 1 file changed, 119 deletions(-) delete mode 100644 target/linux/generic/patches-4.9/065-v4.13-0003-mtd-partitions-add-helper-for-deleting-partition.patch (limited to 'target/linux/generic/patches-4.9/065-v4.13-0003-mtd-partitions-add-helper-for-deleting-partition.patch') diff --git a/target/linux/generic/patches-4.9/065-v4.13-0003-mtd-partitions-add-helper-for-deleting-partition.patch b/target/linux/generic/patches-4.9/065-v4.13-0003-mtd-partitions-add-helper-for-deleting-partition.patch deleted file mode 100644 index d93f4ba..0000000 --- a/target/linux/generic/patches-4.9/065-v4.13-0003-mtd-partitions-add-helper-for-deleting-partition.patch +++ /dev/null @@ -1,119 +0,0 @@ -From 08263a9ae664b24fa777d20b365601534842b236 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Wed, 21 Jun 2017 08:26:42 +0200 -Subject: [PATCH] mtd: partitions: add helper for deleting partition -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -There are two similar functions handling deletion. One handles single -partition and another the whole MTD flash device. They share (duplicate) -some code so it makes sense to add a small helper for that part. - -Function del_mtd_partitions has been moved a bit to keep all deleting -stuff together. - -Signed-off-by: Rafał Miłecki -Signed-off-by: Brian Norris ---- - drivers/mtd/mtdpart.c | 75 +++++++++++++++++++++++++++++---------------------- - 1 file changed, 43 insertions(+), 32 deletions(-) - ---- a/drivers/mtd/mtdpart.c -+++ b/drivers/mtd/mtdpart.c -@@ -363,32 +363,6 @@ static inline void free_partition(struct - kfree(p); - } - --/* -- * This function unregisters and destroy all slave MTD objects which are -- * attached to the given master MTD object. -- */ -- --int del_mtd_partitions(struct mtd_info *master) --{ -- struct mtd_part *slave, *next; -- int ret, err = 0; -- -- mutex_lock(&mtd_partitions_mutex); -- list_for_each_entry_safe(slave, next, &mtd_partitions, list) -- if (slave->master == master) { -- ret = del_mtd_device(&slave->mtd); -- if (ret < 0) { -- err = ret; -- continue; -- } -- list_del(&slave->list); -- free_partition(slave); -- } -- mutex_unlock(&mtd_partitions_mutex); -- -- return err; --} -- - static struct mtd_part *allocate_partition(struct mtd_info *master, - const struct mtd_partition *part, int partno, - uint64_t cur_offset) -@@ -675,6 +649,48 @@ int mtd_add_partition(struct mtd_info *m - } - EXPORT_SYMBOL_GPL(mtd_add_partition); - -+/** -+ * __mtd_del_partition - delete MTD partition -+ * -+ * @priv: internal MTD struct for partition to be deleted -+ * -+ * This function must be called with the partitions mutex locked. -+ */ -+static int __mtd_del_partition(struct mtd_part *priv) -+{ -+ int err; -+ -+ err = del_mtd_device(&priv->mtd); -+ if (err) -+ return err; -+ -+ list_del(&priv->list); -+ free_partition(priv); -+ -+ return 0; -+} -+ -+/* -+ * This function unregisters and destroy all slave MTD objects which are -+ * attached to the given master MTD object. -+ */ -+int del_mtd_partitions(struct mtd_info *master) -+{ -+ struct mtd_part *slave, *next; -+ int ret, err = 0; -+ -+ mutex_lock(&mtd_partitions_mutex); -+ list_for_each_entry_safe(slave, next, &mtd_partitions, list) -+ if (slave->master == master) { -+ ret = __mtd_del_partition(slave); -+ if (ret < 0) -+ err = ret; -+ } -+ mutex_unlock(&mtd_partitions_mutex); -+ -+ return err; -+} -+ - int mtd_del_partition(struct mtd_info *master, int partno) - { - struct mtd_part *slave, *next; -@@ -686,12 +702,7 @@ int mtd_del_partition(struct mtd_info *m - (slave->mtd.index == partno)) { - sysfs_remove_files(&slave->mtd.dev.kobj, - mtd_partition_attrs); -- ret = del_mtd_device(&slave->mtd); -- if (ret < 0) -- break; -- -- list_del(&slave->list); -- free_partition(slave); -+ ret = __mtd_del_partition(slave); - break; - } - mutex_unlock(&mtd_partitions_mutex); -- cgit v1.1