diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/amba/bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c index 00c46e0b40e4..3d763fdf99b7 100644 --- a/drivers/amba/bus.c +++ b/drivers/amba/bus.c | |||
@@ -210,7 +210,7 @@ int amba_device_register(struct amba_device *dev, struct resource *parent) | |||
210 | dev->dev.release = amba_device_release; | 210 | dev->dev.release = amba_device_release; |
211 | dev->dev.bus = &amba_bustype; | 211 | dev->dev.bus = &amba_bustype; |
212 | dev->dev.dma_mask = &dev->dma_mask; | 212 | dev->dev.dma_mask = &dev->dma_mask; |
213 | dev->res.name = dev->dev.bus_id; | 213 | dev->res.name = dev_name(&dev->dev); |
214 | 214 | ||
215 | if (!dev->dev.coherent_dma_mask && dev->dma_mask) | 215 | if (!dev->dev.coherent_dma_mask && dev->dma_mask) |
216 | dev_warn(&dev->dev, "coherent dma mask is unset\n"); | 216 | dev_warn(&dev->dev, "coherent dma mask is unset\n"); |
@@ -294,7 +294,7 @@ static int amba_find_match(struct device *dev, void *data) | |||
294 | if (d->parent) | 294 | if (d->parent) |
295 | r &= d->parent == dev->parent; | 295 | r &= d->parent == dev->parent; |
296 | if (d->busid) | 296 | if (d->busid) |
297 | r &= strcmp(dev->bus_id, d->busid) == 0; | 297 | r &= strcmp(dev_name(dev), d->busid) == 0; |
298 | 298 | ||
299 | if (r) { | 299 | if (r) { |
300 | get_device(dev); | 300 | get_device(dev); |