mmc: make mmc_dev_to_card() macro public

Conversion from struct device to struct mmc_card is used more than in one
place.  Due to this it's better to have public macro for such thing.

Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com>
Cc: Adrian Hunter <adrian.hunter@nokia.com>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Chris Ball <cjb@laptop.org>

diff --git a/drivers/mmc/card/mmc_test.c b/drivers/mmc/card/mmc_test.c
index 5dd8576b5c182069824b85bef9c29039bbd521b2..82d39bd4f55fc8a7d900036bef96b563c34fd7b0 100644 (file)
--- a/drivers/mmc/card/mmc_test.c
+++ b/drivers/mmc/card/mmc_test.c
@@ -1935,12 +1935,10 @@ static ssize_t mmc_test_show(struct device *dev,
 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 --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index 7cd9749dc21dafd6bd4e280bd903129952f23a17..27326c411735f4f7db7c9afdd7a86d67b79d095e 100644 (file)
--- a/drivers/mmc/core/bus.c
+++ b/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 --git a/drivers/mmc/core/bus.h b/drivers/mmc/core/bus.h
index 18178766ab461122797734a805041e028a4041cf..7813954e3199046a9a457807df705ed0b676529a 100644 (file)
--- a/drivers/mmc/core/bus.h
+++ b/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 --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index 6b7525099e56a943f014c9fbfcc0c6bc45b62579..71acf19ecaf3837c50045a1b6d7f29a4feb08c59 100644 (file)
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -173,6 +173,8 @@ static inline int mmc_blksz_for_byte_mode(const struct mmc_card *c)
 #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)