aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorAndy Shevchenko <andy.shevchenko@gmail.com>2010-08-20 03:46:46 -0400
committerChris Ball <cjb@laptop.org>2010-10-23 09:11:12 -0400
commit453722b9f7366e5b8b46101358dd7bcaef62b59d (patch)
treedecce1983521459f06ccd63563074114f17a7a52 /drivers/mmc
parent12578f66b9058e63f193fbfe1552e1d1bfa361bb (diff)
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>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/card/mmc_test.c4
-rw-r--r--drivers/mmc/core/bus.c1
-rw-r--r--drivers/mmc/core/bus.h2
3 files changed, 2 insertions, 5 deletions
diff --git a/drivers/mmc/card/mmc_test.c b/drivers/mmc/card/mmc_test.c
index 5dd8576b5c18..82d39bd4f55f 100644
--- 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,
1935static ssize_t mmc_test_store(struct device *dev, 1935static ssize_t mmc_test_store(struct device *dev,
1936 struct device_attribute *attr, const char *buf, size_t count) 1936 struct device_attribute *attr, const char *buf, size_t count)
1937{ 1937{
1938 struct mmc_card *card; 1938 struct mmc_card *card = dev_to_mmc_card(dev);
1939 struct mmc_test_card *test; 1939 struct mmc_test_card *test;
1940 int testcase; 1940 int testcase;
1941 1941
1942 card = container_of(dev, struct mmc_card, dev);
1943
1944 testcase = simple_strtol(buf, NULL, 10); 1942 testcase = simple_strtol(buf, NULL, 10);
1945 1943
1946 test = kzalloc(sizeof(struct mmc_test_card), GFP_KERNEL); 1944 test = kzalloc(sizeof(struct mmc_test_card), GFP_KERNEL);
diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index 7cd9749dc21d..27326c411735 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -22,7 +22,6 @@
22#include "sdio_cis.h" 22#include "sdio_cis.h"
23#include "bus.h" 23#include "bus.h"
24 24
25#define dev_to_mmc_card(d) container_of(d, struct mmc_card, dev)
26#define to_mmc_driver(d) container_of(d, struct mmc_driver, drv) 25#define to_mmc_driver(d) container_of(d, struct mmc_driver, drv)
27 26
28static ssize_t mmc_type_show(struct device *dev, 27static ssize_t mmc_type_show(struct device *dev,
diff --git a/drivers/mmc/core/bus.h b/drivers/mmc/core/bus.h
index 18178766ab46..7813954e3199 100644
--- a/drivers/mmc/core/bus.h
+++ b/drivers/mmc/core/bus.h
@@ -14,7 +14,7 @@
14#define MMC_DEV_ATTR(name, fmt, args...) \ 14#define MMC_DEV_ATTR(name, fmt, args...) \
15static ssize_t mmc_##name##_show (struct device *dev, struct device_attribute *attr, char *buf) \ 15static ssize_t mmc_##name##_show (struct device *dev, struct device_attribute *attr, char *buf) \
16{ \ 16{ \
17 struct mmc_card *card = container_of(dev, struct mmc_card, dev); \ 17 struct mmc_card *card = dev_to_mmc_card(dev); \
18 return sprintf(buf, fmt, args); \ 18 return sprintf(buf, fmt, args); \
19} \ 19} \
20static DEVICE_ATTR(name, S_IRUGO, mmc_##name##_show, NULL) 20static DEVICE_ATTR(name, S_IRUGO, mmc_##name##_show, NULL)