From: Kay Sievers Date: Tue, 6 Jan 2009 18:44:37 +0000 (-0800) Subject: swiotlb: struct device - replace bus_id with dev_name(), dev_set_name() X-Git-Tag: v2.6.29-rc1~229^2~31 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=94b324864ef2a8e461f3933ab99638255299e9f0;p=linux-2.6-omap-h63xx.git swiotlb: struct device - replace bus_id with dev_name(), dev_set_name() Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman --- diff --git a/lib/swiotlb.c b/lib/swiotlb.c index 7f5e21b9c16..c2a4e640145 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c @@ -647,7 +647,7 @@ swiotlb_full(struct device *dev, size_t size, int dir, int do_panic) * the damage, or panic when the transfer is too big. */ printk(KERN_ERR "DMA: Out of SW-IOMMU space for %zu bytes at " - "device %s\n", size, dev ? dev->bus_id : "?"); + "device %s\n", size, dev ? dev_name(dev) : "?"); if (size > io_tlb_overflow && do_panic) { if (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL)