From c2d9e81faa5aec64c349fa995773bb2cc6295c21 Mon Sep 17 00:00:00 2001 From: Dave Jones <davej@redhat.com> Date: Tue, 16 Sep 2003 03:04:25 +0100 Subject: [PATCH] [AGPGART] Missing prefixes in printk's --- drivers/char/agp/alpha-agp.c | 2 +- drivers/char/agp/amd64-agp.c | 24 ++++++++++++------------ drivers/char/agp/ati-agp.c | 2 +- drivers/char/agp/intel-agp.c | 2 +- drivers/char/agp/nvidia-agp.c | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/char/agp/alpha-agp.c b/drivers/char/agp/alpha-agp.c index 2124f66193ce..803e1c4d7ec9 100644 --- a/drivers/char/agp/alpha-agp.c +++ b/drivers/char/agp/alpha-agp.c @@ -183,7 +183,7 @@ alpha_core_agp_setup(void) alpha_bridge->dev = pdev; alpha_bridge->mode = agp->capability.lw; - printk(KERN_INFO "Detected AGP on hose %d\n", agp->hose->index); + printk(KERN_INFO PFX "Detected AGP on hose %d\n", agp->hose->index); return agp_add_bridge(alpha_bridge); fail: diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c index 90fe501281c7..f2edc52adb59 100644 --- a/drivers/char/agp/amd64-agp.c +++ b/drivers/char/agp/amd64-agp.c @@ -252,15 +252,15 @@ static int __init aperture_valid(u64 aper, u32 size) static int not_first_call; u32 pfn, c; if (aper == 0) { - printk(KERN_ERR "No aperture\n"); + printk(KERN_ERR PFX "No aperture\n"); return 0; } if (size < 32*1024*1024) { - printk(KERN_ERR "Aperture too small (%d MB)\n", size>>20); + printk(KERN_ERR PFX "Aperture too small (%d MB)\n", size>>20); return 0; } if (aper + size > 0xffffffff) { - printk(KERN_ERR "Aperture out of bounds\n"); + printk(KERN_ERR PFX "Aperture out of bounds\n"); return 0; } pfn = aper >> PAGE_SHIFT; @@ -268,7 +268,7 @@ static int __init aperture_valid(u64 aper, u32 size) if (!pfn_valid(pfn + c)) break; if (!PageReserved(pfn_to_page(pfn + c))) { - printk(KERN_ERR "Aperture pointing to RAM\n"); + printk(KERN_ERR PFX "Aperture pointing to RAM\n"); return 0; } } @@ -279,7 +279,7 @@ static int __init aperture_valid(u64 aper, u32 size) Maybe better to use pci_assign_resource/pci_enable_device instead trusting the bridges? */ if (!not_first_call && request_mem_region(aper, size, "aperture") < 0) { - printk(KERN_ERR "Aperture conflicts with PCI mapping.\n"); + printk(KERN_ERR PFX "Aperture conflicts with PCI mapping.\n"); return 0; } @@ -328,7 +328,7 @@ static __init int fix_northbridge(struct pci_dev *nb, struct pci_dev *agp, pci_read_config_dword(agp, 0x10, &aper_low); pci_read_config_dword(agp, 0x14, &aper_hi); aper = (aper_low & ~((1<<22)-1)) | ((u64)aper_hi << 32); - printk(KERN_INFO "Aperture from AGP @ %Lx size %u MB\n", aper, 32 << order); + printk(KERN_INFO PFX "Aperture from AGP @ %Lx size %u MB\n", aper, 32 << order); if (order < 0 || !aperture_valid(aper, (32*1024*1024)<<order)) return -1; @@ -347,17 +347,17 @@ static __init int cache_nbs (struct pci_dev *pdev, u32 cap_ptr) while ((loop_dev = pci_find_device(PCI_VENDOR_ID_AMD, 0x1103, loop_dev)) != NULL) { if (fix_northbridge(loop_dev, pdev, cap_ptr) < 0) { - printk("No usable aperture found.\n"); + printk(KERN_INFO PFX "No usable aperture found.\n"); #ifdef __x86_64__ /* should port this to i386 */ - printk("Consider rebooting with iommu=memaper=2 to get a good aperture.\n"); + printk(KERN_INFO PFX "Consider rebooting with iommu=memaper=2 to get a good aperture.\n"); #endif return -1; } hammers[i++] = loop_dev; nr_garts = i; if (i == MAX_HAMMER_GARTS) { - printk(KERN_INFO "Too many northbridges for AGP\n"); + printk(KERN_INFO PFX "Too many northbridges for AGP\n"); return -1; } } @@ -498,11 +498,11 @@ int __init agp_amd64_init(void) if (pci_module_init(&agp_amd64_pci_driver) > 0) { struct pci_dev *dev; if (!agp_try_unsupported && !agp_try_unsupported_boot) { - printk(KERN_INFO "No supported AGP bridge found.\n"); + printk(KERN_INFO PFX "No supported AGP bridge found.\n"); #ifdef MODULE - printk(KERN_INFO "You can try agp_try_unsupported=1\n"); + printk(KERN_INFO PFX "You can try agp_try_unsupported=1\n"); #else - printk(KERN_INFO "You can boot with agp=try_unsupported\n"); + printk(KERN_INFO PFX "You can boot with agp=try_unsupported\n"); #endif return -ENODEV; } diff --git a/drivers/char/agp/ati-agp.c b/drivers/char/agp/ati-agp.c index 0a34177b6ee5..ecb2b0349d3e 100644 --- a/drivers/char/agp/ati-agp.c +++ b/drivers/char/agp/ati-agp.c @@ -214,7 +214,7 @@ static int ati_configure(void) /* pci_read_config_dword(agp_bridge.dev, AGP_APBASE, &temp); agp_bridge.gart_bus_addr = (temp & PCI_BASE_ADDRESS_MEM_MASK); - printk(KERN_INFO "IGP320 gart_bus_addr: %x\n", agp_bridge.gart_bus_addr); + printk(KERN_INFO PFX "IGP320 gart_bus_addr: %x\n", agp_bridge.gart_bus_addr); */ OUTREG32(ati_generic_private.registers, ATI_GART_FEATURE_ID, 0x60000); diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c index 918f161d74ce..e65679a20e24 100644 --- a/drivers/char/agp/intel-agp.c +++ b/drivers/char/agp/intel-agp.c @@ -445,7 +445,7 @@ static int intel_i830_insert_entries(struct agp_memory *mem,off_t pg_start, num_entries = A_SIZE_FIX(temp)->num_entries; if (pg_start < intel_i830_private.gtt_entries) { - printk (KERN_DEBUG "pg_start == 0x%.8lx,intel_i830_private.gtt_entries == 0x%.8x\n", + printk (KERN_DEBUG PFX "pg_start == 0x%.8lx,intel_i830_private.gtt_entries == 0x%.8x\n", pg_start,intel_i830_private.gtt_entries); printk (KERN_INFO PFX "Trying to insert into local/stolen memory\n"); diff --git a/drivers/char/agp/nvidia-agp.c b/drivers/char/agp/nvidia-agp.c index 194fe3a0c663..48b5f21f4447 100644 --- a/drivers/char/agp/nvidia-agp.c +++ b/drivers/char/agp/nvidia-agp.c @@ -196,7 +196,7 @@ static void nvidia_tlbflush(struct agp_memory *mem) pci_read_config_dword(nvidia_private.dev_1, NVIDIA_1_WBC, &wbc_reg); if ((signed)(end - jiffies) <= 0) { - printk(KERN_ERR + printk(KERN_ERR PFX "TLB flush took more than 3 seconds.\n"); } } while (wbc_reg & nvidia_private.wbc_mask); -- 2.30.9