evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
This commit is contained in:
Kay Sievers 2009-03-24 16:38:22 -07:00 • committed by Greg Kroah-Hartman
parent c3ef01ce4f
commit 9d6b4c82bf
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/amba/bus.c
View file

@ -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);