Commit 265cdc90 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Chris Ball

mmc: rename dev_to_mmc_card() to mmc_dev_to_card()

Global symbols should use their subsystem name in a prefixed fashion.
Signed-off-by: default avatarAndy Shevchenko <ext-andriy.shevchenko@nokia.com>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 453722b9
...@@ -1935,7 +1935,7 @@ static ssize_t mmc_test_show(struct device *dev, ...@@ -1935,7 +1935,7 @@ static ssize_t mmc_test_show(struct device *dev,
static ssize_t mmc_test_store(struct device *dev, static ssize_t mmc_test_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count) struct device_attribute *attr, const char *buf, size_t count)
{ {
struct mmc_card *card = dev_to_mmc_card(dev); struct mmc_card *card = mmc_dev_to_card(dev);
struct mmc_test_card *test; struct mmc_test_card *test;
int testcase; int testcase;
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
static ssize_t mmc_type_show(struct device *dev, static ssize_t mmc_type_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct mmc_card *card = dev_to_mmc_card(dev); struct mmc_card *card = mmc_dev_to_card(dev);
switch (card->type) { switch (card->type) {
case MMC_TYPE_MMC: case MMC_TYPE_MMC:
...@@ -61,7 +61,7 @@ static int mmc_bus_match(struct device *dev, struct device_driver *drv) ...@@ -61,7 +61,7 @@ static int mmc_bus_match(struct device *dev, struct device_driver *drv)
static int static int
mmc_bus_uevent(struct device *dev, struct kobj_uevent_env *env) mmc_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
{ {
struct mmc_card *card = dev_to_mmc_card(dev); struct mmc_card *card = mmc_dev_to_card(dev);
const char *type; const char *type;
int retval = 0; int retval = 0;
...@@ -104,7 +104,7 @@ mmc_bus_uevent(struct device *dev, struct kobj_uevent_env *env) ...@@ -104,7 +104,7 @@ mmc_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
static int mmc_bus_probe(struct device *dev) static int mmc_bus_probe(struct device *dev)
{ {
struct mmc_driver *drv = to_mmc_driver(dev->driver); struct mmc_driver *drv = to_mmc_driver(dev->driver);
struct mmc_card *card = dev_to_mmc_card(dev); struct mmc_card *card = mmc_dev_to_card(dev);
return drv->probe(card); return drv->probe(card);
} }
...@@ -112,7 +112,7 @@ static int mmc_bus_probe(struct device *dev) ...@@ -112,7 +112,7 @@ static int mmc_bus_probe(struct device *dev)
static int mmc_bus_remove(struct device *dev) static int mmc_bus_remove(struct device *dev)
{ {
struct mmc_driver *drv = to_mmc_driver(dev->driver); struct mmc_driver *drv = to_mmc_driver(dev->driver);
struct mmc_card *card = dev_to_mmc_card(dev); struct mmc_card *card = mmc_dev_to_card(dev);
drv->remove(card); drv->remove(card);
...@@ -122,7 +122,7 @@ static int mmc_bus_remove(struct device *dev) ...@@ -122,7 +122,7 @@ static int mmc_bus_remove(struct device *dev)
static int mmc_bus_suspend(struct device *dev, pm_message_t state) static int mmc_bus_suspend(struct device *dev, pm_message_t state)
{ {
struct mmc_driver *drv = to_mmc_driver(dev->driver); struct mmc_driver *drv = to_mmc_driver(dev->driver);
struct mmc_card *card = dev_to_mmc_card(dev); struct mmc_card *card = mmc_dev_to_card(dev);
int ret = 0; int ret = 0;
if (dev->driver && drv->suspend) if (dev->driver && drv->suspend)
...@@ -133,7 +133,7 @@ static int mmc_bus_suspend(struct device *dev, pm_message_t state) ...@@ -133,7 +133,7 @@ static int mmc_bus_suspend(struct device *dev, pm_message_t state)
static int mmc_bus_resume(struct device *dev) static int mmc_bus_resume(struct device *dev)
{ {
struct mmc_driver *drv = to_mmc_driver(dev->driver); struct mmc_driver *drv = to_mmc_driver(dev->driver);
struct mmc_card *card = dev_to_mmc_card(dev); struct mmc_card *card = mmc_dev_to_card(dev);
int ret = 0; int ret = 0;
if (dev->driver && drv->resume) if (dev->driver && drv->resume)
...@@ -188,7 +188,7 @@ EXPORT_SYMBOL(mmc_unregister_driver); ...@@ -188,7 +188,7 @@ EXPORT_SYMBOL(mmc_unregister_driver);
static void mmc_release_card(struct device *dev) static void mmc_release_card(struct device *dev)
{ {
struct mmc_card *card = dev_to_mmc_card(dev); struct mmc_card *card = mmc_dev_to_card(dev);
sdio_free_common_cis(card); sdio_free_common_cis(card);
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#define MMC_DEV_ATTR(name, fmt, args...) \ #define MMC_DEV_ATTR(name, fmt, args...) \
static ssize_t mmc_##name##_show (struct device *dev, struct device_attribute *attr, char *buf) \ static ssize_t mmc_##name##_show (struct device *dev, struct device_attribute *attr, char *buf) \
{ \ { \
struct mmc_card *card = dev_to_mmc_card(dev); \ struct mmc_card *card = mmc_dev_to_card(dev); \
return sprintf(buf, fmt, args); \ return sprintf(buf, fmt, args); \
} \ } \
static DEVICE_ATTR(name, S_IRUGO, mmc_##name##_show, NULL) static DEVICE_ATTR(name, S_IRUGO, mmc_##name##_show, NULL)
......
...@@ -173,7 +173,7 @@ static inline int mmc_blksz_for_byte_mode(const struct mmc_card *c) ...@@ -173,7 +173,7 @@ 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_name(c) ((c)->cid.prod_name)
#define mmc_card_id(c) (dev_name(&(c)->dev)) #define mmc_card_id(c) (dev_name(&(c)->dev))
#define dev_to_mmc_card(d) container_of(d, struct mmc_card, dev) #define mmc_dev_to_card(d) container_of(d, struct mmc_card, dev)
#define mmc_list_to_card(l) container_of(l, struct mmc_card, node) #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_get_drvdata(c) dev_get_drvdata(&(c)->dev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment