mirror of
https://github.com/torvalds/linux.git
synced 2024-11-15 00:21:59 +00:00
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>
This commit is contained in:
parent
8e0ee43bc2
commit
89c8aa203e
@ -1603,7 +1603,7 @@ static int __init atmci_probe(struct platform_device *pdev)
|
|||||||
|
|
||||||
tasklet_init(&host->tasklet, atmci_tasklet_func, (unsigned long)host);
|
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)
|
if (ret)
|
||||||
goto err_request_irq;
|
goto err_request_irq;
|
||||||
|
|
||||||
|
@ -103,7 +103,7 @@ struct mmc_spi_platform_data *mmc_spi_get_pdata(struct spi_device *spi)
|
|||||||
if (!gpio_is_valid(oms->gpios[i]))
|
if (!gpio_is_valid(oms->gpios[i]))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
ret = gpio_request(oms->gpios[i], dev->bus_id);
|
ret = gpio_request(oms->gpios[i], dev_name(dev));
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
oms->gpios[i] = -EINVAL;
|
oms->gpios[i] = -EINVAL;
|
||||||
continue;
|
continue;
|
||||||
|
Loading…
Reference in New Issue
Block a user