mmc: struct device - replace bus_id with dev_name(), dev_set_name()

Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>

2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 2b1196e6142..e94e92001e7 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -1603,7 +1603,7 @@ static int __init atmci_probe(struct platform_device *pdev)
 
         tasklet_init(&host->tasklet, atmci_tasklet_func, (unsigned long)host);
 
-        ret = request_irq(irq, atmci_interrupt, 0, pdev->dev.bus_id, host);
+        ret = request_irq(irq, atmci_interrupt, 0, dev_name(&pdev->dev), host);
         if (ret)
                 goto err_request_irq;
 
diff --git a/drivers/mmc/host/of_mmc_spi.c b/drivers/mmc/host/of_mmc_spi.c
index fb2921f8099..0c44d560bf1 100644
--- a/drivers/mmc/host/of_mmc_spi.c
+++ b/drivers/mmc/host/of_mmc_spi.c
@@ -103,7 +103,7 @@ struct mmc_spi_platform_data *mmc_spi_get_pdata(struct spi_device *spi)
                 if (!gpio_is_valid(oms->gpios[i]))
                         continue;
 
-                ret = gpio_request(oms->gpios[i], dev->bus_id);
+                ret = gpio_request(oms->gpios[i], dev_name(dev));
                 if (ret < 0) {
                         oms->gpios[i] = -EINVAL;
                         continue;