+ mmc-make-dev_to_mmc_card-macro-public.patch added to -mm tree

Commit Message

Andrew Morton Aug. 19, 2010, 9:49 p.m. UTC

None

Patch

diff -puN drivers/mmc/card/mmc_test.c~mmc-make-dev_to_mmc_card-macro-public drivers/mmc/card/mmc_test.c
--- a/drivers/mmc/card/mmc_test.c~mmc-make-dev_to_mmc_card-macro-public
+++ a/drivers/mmc/card/mmc_test.c
@@ -1935,12 +1935,10 @@  static ssize_t mmc_test_show(struct devi
 static ssize_t mmc_test_store(struct device *dev,
 	struct device_attribute *attr, const char *buf, size_t count)
 {
-	struct mmc_card *card;
+	struct mmc_card *card = dev_to_mmc_card(dev);
 	struct mmc_test_card *test;
 	int testcase;
 
-	card = container_of(dev, struct mmc_card, dev);
-
 	testcase = simple_strtol(buf, NULL, 10);
 
 	test = kzalloc(sizeof(struct mmc_test_card), GFP_KERNEL);
diff -puN drivers/mmc/core/bus.c~mmc-make-dev_to_mmc_card-macro-public drivers/mmc/core/bus.c
--- a/drivers/mmc/core/bus.c~mmc-make-dev_to_mmc_card-macro-public
+++ a/drivers/mmc/core/bus.c
@@ -22,7 +22,6 @@ 
 #include "sdio_cis.h"
 #include "bus.h"
 
-#define dev_to_mmc_card(d)	container_of(d, struct mmc_card, dev)
 #define to_mmc_driver(d)	container_of(d, struct mmc_driver, drv)
 
 static ssize_t mmc_type_show(struct device *dev,
diff -puN drivers/mmc/core/bus.h~mmc-make-dev_to_mmc_card-macro-public drivers/mmc/core/bus.h
--- a/drivers/mmc/core/bus.h~mmc-make-dev_to_mmc_card-macro-public
+++ a/drivers/mmc/core/bus.h
@@ -14,7 +14,7 @@ 
 #define MMC_DEV_ATTR(name, fmt, args...)					\
 static ssize_t mmc_##name##_show (struct device *dev, struct device_attribute *attr, char *buf)	\
 {										\
-	struct mmc_card *card = container_of(dev, struct mmc_card, dev);	\
+	struct mmc_card *card = dev_to_mmc_card(dev);				\
 	return sprintf(buf, fmt, args);						\
 }										\
 static DEVICE_ATTR(name, S_IRUGO, mmc_##name##_show, NULL)
diff -puN include/linux/mmc/card.h~mmc-make-dev_to_mmc_card-macro-public include/linux/mmc/card.h
--- a/include/linux/mmc/card.h~mmc-make-dev_to_mmc_card-macro-public
+++ a/include/linux/mmc/card.h
@@ -173,6 +173,8 @@  static inline int mmc_blksz_for_byte_mod
 #define mmc_card_name(c)	((c)->cid.prod_name)
 #define mmc_card_id(c)		(dev_name(&(c)->dev))
 
+#define dev_to_mmc_card(d)	container_of(d, struct mmc_card, dev)
+
 #define mmc_list_to_card(l)	container_of(l, struct mmc_card, node)
 #define mmc_get_drvdata(c)	dev_get_drvdata(&(c)->dev)
 #define mmc_set_drvdata(c,d)	dev_set_drvdata(&(c)->dev, d)