|
@@ -27,7 +27,7 @@
|
|
|
static ssize_t mmc_type_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);
|
|
|
|
|
|
switch (card->type) {
|
|
|
case MMC_TYPE_MMC:
|
|
@@ -61,7 +61,7 @@ static int mmc_bus_match(struct device *dev, struct device_driver *drv)
|
|
|
static int
|
|
|
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;
|
|
|
int retval = 0;
|
|
|
|
|
@@ -104,7 +104,7 @@ mmc_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
|
|
|
static int mmc_bus_probe(struct device *dev)
|
|
|
{
|
|
|
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);
|
|
|
}
|
|
@@ -112,7 +112,7 @@ static int mmc_bus_probe(struct device *dev)
|
|
|
static int mmc_bus_remove(struct device *dev)
|
|
|
{
|
|
|
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);
|
|
|
|
|
@@ -122,7 +122,7 @@ static int mmc_bus_remove(struct device *dev)
|
|
|
static int mmc_bus_suspend(struct device *dev, pm_message_t state)
|
|
|
{
|
|
|
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;
|
|
|
|
|
|
if (dev->driver && drv->suspend)
|
|
@@ -133,7 +133,7 @@ static int mmc_bus_suspend(struct device *dev, pm_message_t state)
|
|
|
static int mmc_bus_resume(struct device *dev)
|
|
|
{
|
|
|
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;
|
|
|
|
|
|
if (dev->driver && drv->resume)
|
|
@@ -188,7 +188,7 @@ EXPORT_SYMBOL(mmc_unregister_driver);
|
|
|
|
|
|
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);
|
|
|
|