diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-05-02 00:02:41 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-22 00:54:53 -0400 |
commit | fc3a8828b139c24aade3f9d608775e36c248f8f5 (patch) | |
tree | e995fdb99868b96e6c51c100fe9270a79323fd83 /arch/x86/kernel/pci-dma.c | |
parent | b98cb4b7fe0e83238501b48489e46b3e0dce9aaf (diff) |
driver core: fix a lot of printk usages of bus_id
We have the dev_printk() variants for this kind of thing, use them
instead of directly trying to access the bus_id field of struct device.
This is done in order to remove bus_id entirely.
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/x86/kernel/pci-dma.c')
-rw-r--r-- | arch/x86/kernel/pci-dma.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c index a4213c00dffc..cbecb05551bb 100644 --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c | |||
@@ -314,8 +314,7 @@ int dma_supported(struct device *dev, u64 mask) | |||
314 | { | 314 | { |
315 | #ifdef CONFIG_PCI | 315 | #ifdef CONFIG_PCI |
316 | if (mask > 0xffffffff && forbid_dac > 0) { | 316 | if (mask > 0xffffffff && forbid_dac > 0) { |
317 | printk(KERN_INFO "PCI: Disallowing DAC for device %s\n", | 317 | dev_info(dev, "PCI: Disallowing DAC for device\n"); |
318 | dev->bus_id); | ||
319 | return 0; | 318 | return 0; |
320 | } | 319 | } |
321 | #endif | 320 | #endif |
@@ -342,8 +341,7 @@ int dma_supported(struct device *dev, u64 mask) | |||
342 | type. Normally this doesn't make any difference, but gives | 341 | type. Normally this doesn't make any difference, but gives |
343 | more gentle handling of IOMMU overflow. */ | 342 | more gentle handling of IOMMU overflow. */ |
344 | if (iommu_sac_force && (mask >= DMA_40BIT_MASK)) { | 343 | if (iommu_sac_force && (mask >= DMA_40BIT_MASK)) { |
345 | printk(KERN_INFO "%s: Force SAC with mask %Lx\n", | 344 | dev_info(dev, "Force SAC with mask %Lx\n", mask); |
346 | dev->bus_id, mask); | ||
347 | return 0; | 345 | return 0; |
348 | } | 346 | } |
349 | 347 | ||