mtd: simplify get_mtd_device_nm function (52534f2d) · Commits · 戴 / test

'get_mtd_device_nm()' has a piece of code which equivalent to what '__get_mtd_device()' does - remove this duplicated code and use ''__get_mtd_device()' instead. Artem: changed commit message. Artem: while on it, remove an unnecessary extra empty line Signed-off-by:

Wanlong Gao <wanlong.gao@gmail.com> Signed-off-by:

Artem Bityutskiy <Artem.Bityutskiy@nokia.com> Signed-off-by:

David Woodhouse <David.Woodhouse@intel.com>

drivers/mtd/mtdcore.c

+2 −11

Original line number	Diff line number	Diff line
		@@ -533,7 +533,6 @@ int __get_mtd_device(struct mtd_info *mtd)
		return -ENODEV;

		if (mtd->get_device) {

		err = mtd->get_device(mtd);

		if (err) {
		@@ -571,21 +570,13 @@ struct mtd_info get_mtd_device_nm(const char name)
		if (!mtd)
		goto out_unlock;

		if (!try_module_get(mtd->owner))
		goto out_unlock;

		if (mtd->get_device) {
		err = mtd->get_device(mtd);
		err = __get_mtd_device(mtd);
		if (err)
		goto out_put;
		}
		goto out_unlock;

		mtd->usecount++;
		mutex_unlock(&mtd_table_mutex);
		return mtd;

		out_put:
		module_put(mtd->owner);
		out_unlock:
		mutex_unlock(&mtd_table_mutex);
		return ERR_PTR(err);

Admin message