Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89c8aa20 authored by Kay Sievers's avatar Kay Sievers Committed by Pierre Ossman
Browse files

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



Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
parent 8e0ee43b

drivers/mmc/host/atmel-mci.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/mmc/host/of_mmc_spi.c

+1 −1
Original line number Diff line number Diff line
@@ -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;