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

Commit 9d6b4c82 authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

amba: 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>
parent c3ef01ce

drivers/amba/bus.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -210,7 +210,7 @@ int amba_device_register(struct amba_device *dev, struct resource *parent) 
	dev->dev.release = amba_device_release;

	dev->dev.release = amba_device_release;

	dev->dev.bus = &amba_bustype;

	dev->dev.bus = &amba_bustype;

	dev->dev.dma_mask = &dev->dma_mask;

	dev->dev.dma_mask = &dev->dma_mask;

	dev->res.name = dev->dev.bus_id;

	dev->res.name = dev_name(&dev->dev);





	if (!dev->dev.coherent_dma_mask && dev->dma_mask)

	if (!dev->dev.coherent_dma_mask && dev->dma_mask)

		dev_warn(&dev->dev, "coherent dma mask is unset\n");

		dev_warn(&dev->dev, "coherent dma mask is unset\n");
@@ -294,7 +294,7 @@ static int amba_find_match(struct device *dev, void *data) 
	if (d->parent)

	if (d->parent)

		r &= d->parent == dev->parent;

		r &= d->parent == dev->parent;

	if (d->busid)

	if (d->busid)

		r &= strcmp(dev->bus_id, d->busid) == 0;

		r &= strcmp(dev_name(dev), d->busid) == 0;





	if (r) {

	if (r) {

		get_device(dev);

		get_device(dev);