UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

mtd: simplify get_mtd_device_nm function 

'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>
This commit is contained in:
Wanlong Gao 2011-05-17 22:36:18 +08:00 committed by David Woodhouse
parent 7c802fbd54
commit 52534f2dba
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/mtd/mtdcore.c
View File

@ -533,7 +533,6 @@ int __get_mtd_device(struct mtd_info *mtd)
return -ENODEV; return -ENODEV;
if (mtd->get_device) { if (mtd->get_device) {
err = mtd->get_device(mtd); err = mtd->get_device(mtd);
if (err) { if (err) {
@ -571,21 +570,13 @@ struct mtd_info *get_mtd_device_nm(const char *name)
if (!mtd) if (!mtd)
goto out_unlock; goto out_unlock;
if (!try_module_get(mtd->owner)) err = __get_mtd_device(mtd);
if (err)
goto out_unlock; goto out_unlock;
if (mtd->get_device) {
err = mtd->get_device(mtd);
if (err)
goto out_put;
}
mtd->usecount++;
mutex_unlock(&mtd_table_mutex); mutex_unlock(&mtd_table_mutex);
return mtd; return mtd;
out_put:
module_put(mtd->owner);
out_unlock: out_unlock:
mutex_unlock(&mtd_table_mutex); mutex_unlock(&mtd_table_mutex);
return ERR_PTR(err); return ERR_PTR(err);