PCI: Replace printks with appropriate pr_*()

Replace deprecated printk(KERN_ERR...) with pr_err() in arch/ia64/pci/pci.c

Signed-off-by: Yijing Wang <wangyijing@huawei.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-ia64@vger.kernel.org
Signed-off-by: Tony Luck <tony.luck@intel.com>

diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 586cac1f47bb79b8756aa8aac3e7da8ba20976a2..2326790b7d8be4f9e6cffbea4c4a22fc1ab91f3e 100644 (file)
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -157,7 +157,7 @@ new_space (u64 phys_base, int sparse)
                        return i;
 
        if (num_io_spaces == MAX_IO_SPACES) {
-               printk(KERN_ERR "PCI: Too many IO port spaces "
+               pr_err("PCI: Too many IO port spaces "
                        "(MAX_IO_SPACES=%lu)\n", MAX_IO_SPACES);
                return ~0;
        }
@@ -181,8 +181,9 @@ static u64 add_io_space(struct pci_root_info *info,
        len = strlen(info->name) + 32;
        iospace = kzalloc(sizeof(*iospace) + len, GFP_KERNEL);
        if (!iospace) {
-               printk(KERN_ERR "PCI: No memory for %s I/O port space\n",
-                       info->name);
+               dev_err(&info->bridge->dev,
+                               "PCI: No memory for %s I/O port space\n",
+                               info->name);
                goto out;
        }
 
@@ -445,7 +446,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
 
        info = kzalloc(sizeof(*info), GFP_KERNEL);
        if (!info) {
-               printk(KERN_WARNING
+               dev_err(&device->dev,
                                "pci_bus %04x:%02x: ignored (out of memory)\n",
                                domain, busnum);
                kfree(controller);
@@ -781,7 +782,7 @@ static void __init set_pci_dfl_cacheline_size(void)
 
        status = ia64_pal_cache_summary(&levels, &unique_caches);
        if (status != 0) {
-               printk(KERN_ERR "%s: ia64_pal_cache_summary() failed "
+               pr_err("%s: ia64_pal_cache_summary() failed "
                        "(status=%ld)\n", __func__, status);
                return;
        }
@@ -789,7 +790,7 @@ static void __init set_pci_dfl_cacheline_size(void)
        status = ia64_pal_cache_config_info(levels - 1,
                                /* cache_type (data_or_unified)= */ 2, &cci);
        if (status != 0) {
-               printk(KERN_ERR "%s: ia64_pal_cache_config_info() failed "
+               pr_err("%s: ia64_pal_cache_config_info() failed "
                        "(status=%ld)\n", __func__, status);
                return;
        }