diff options
author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2008-07-30 15:26:51 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2008-08-11 20:13:38 -0400 |
commit | e3cf69511a2c5369c58f6fd6a065de152c3d4b22 (patch) | |
tree | 7293c1f55a726e7740949afaf851f1e453dfc087 /drivers/char/agp/generic.c | |
parent | 55814b74c95a73dae6795e167294e6edc733aae9 (diff) |
agp: use dev_printk when possible
Convert printks to use dev_printk().
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/char/agp/generic.c')
-rw-r--r-- | drivers/char/agp/generic.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c index eaa1a355bb32..54c91000646f 100644 --- a/drivers/char/agp/generic.c +++ b/drivers/char/agp/generic.c | |||
@@ -771,8 +771,8 @@ void agp_device_command(u32 bridge_agpstat, bool agp_v3) | |||
771 | if (!agp) | 771 | if (!agp) |
772 | continue; | 772 | continue; |
773 | 773 | ||
774 | printk(KERN_INFO PFX "Putting AGP V%d device at %s into %dx mode\n", | 774 | dev_info(&device->dev, "putting AGP V%d device into %dx mode\n", |
775 | agp_v3 ? 3 : 2, pci_name(device), mode); | 775 | agp_v3 ? 3 : 2, mode); |
776 | pci_write_config_dword(device, agp + PCI_AGP_COMMAND, bridge_agpstat); | 776 | pci_write_config_dword(device, agp + PCI_AGP_COMMAND, bridge_agpstat); |
777 | } | 777 | } |
778 | } | 778 | } |
@@ -800,10 +800,8 @@ void agp_generic_enable(struct agp_bridge_data *bridge, u32 requested_mode) | |||
800 | 800 | ||
801 | get_agp_version(agp_bridge); | 801 | get_agp_version(agp_bridge); |
802 | 802 | ||
803 | printk(KERN_INFO PFX "Found an AGP %d.%d compliant device at %s.\n", | 803 | dev_info(&agp_bridge->dev->dev, "AGP %d.%d bridge\n", |
804 | agp_bridge->major_version, | 804 | agp_bridge->major_version, agp_bridge->minor_version); |
805 | agp_bridge->minor_version, | ||
806 | pci_name(agp_bridge->dev)); | ||
807 | 805 | ||
808 | pci_read_config_dword(agp_bridge->dev, | 806 | pci_read_config_dword(agp_bridge->dev, |
809 | agp_bridge->capndx + PCI_AGP_STATUS, &bridge_agpstat); | 807 | agp_bridge->capndx + PCI_AGP_STATUS, &bridge_agpstat); |
@@ -832,8 +830,7 @@ void agp_generic_enable(struct agp_bridge_data *bridge, u32 requested_mode) | |||
832 | pci_write_config_dword(bridge->dev, | 830 | pci_write_config_dword(bridge->dev, |
833 | bridge->capndx+AGPCTRL, temp); | 831 | bridge->capndx+AGPCTRL, temp); |
834 | 832 | ||
835 | printk(KERN_INFO PFX "Device is in legacy mode," | 833 | dev_info(&bridge->dev->dev, "bridge is in legacy mode, falling back to 2.x\n"); |
836 | " falling back to 2.x\n"); | ||
837 | } | 834 | } |
838 | } | 835 | } |
839 | 836 | ||