Patchwork [27/28] mtd: introduce mtd_get_device interface

login
register
mail settings
Submitter Artem Bityutskiy
Date Dec. 23, 2011, 6:11 p.m.
Message ID <1324663880-22477-28-git-send-email-dedekind1@gmail.com>
Download mbox | patch
Permalink /patch/133132/
State New
Headers show

Comments

Artem Bityutskiy - Dec. 23, 2011, 6:11 p.m.
From: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
---
 drivers/mtd/mtdcore.c   |    2 +-
 include/linux/mtd/mtd.h |    7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

Patch

diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 376fbfd..fbecbe8 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -614,7 +614,7 @@  int __get_mtd_device(struct mtd_info *mtd)
 		return -ENODEV;
 
 	if (mtd->get_device) {
-		err = mtd->get_device(mtd);
+		err = mtd_get_device(mtd);
 
 		if (err) {
 			module_put(mtd->owner);
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index 64aa54f..0e696b7 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -214,6 +214,7 @@  struct mtd_info {
 	int (*block_markbad) (struct mtd_info *mtd, loff_t ofs);
 	int (*suspend) (struct mtd_info *mtd);
 	void (*resume) (struct mtd_info *mtd);
+	int (*get_device) (struct mtd_info *mtd);
 
 	/* Backing device capabilities for this device
 	 * - provides mmap capabilities
@@ -237,7 +238,6 @@  struct mtd_info {
 	 * its own reference counting. The below functions are only for driver.
 	 * The driver may register its callbacks. These callbacks are not
 	 * supposed to be called by MTD users */
-	int (*get_device) (struct mtd_info *mtd);
 	void (*put_device) (struct mtd_info *mtd);
 };
 
@@ -414,6 +414,11 @@  static inline int mtd_block_markbad(struct mtd_info *mtd, loff_t ofs)
 	return mtd->block_markbad(mtd, ofs);
 }
 
+static inline int mtd_get_device(struct mtd_info *mtd)
+{
+	return mtd->get_device(mtd);
+}
+
 static inline struct mtd_info *dev_to_mtd(struct device *dev)
 {
 	return dev ? dev_get_drvdata(dev) : NULL;