aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorYijing Wang <wangyijing@huawei.com>2013-06-06 03:34:53 -0400
committerTony Luck <tony.luck@intel.com>2013-06-18 12:49:23 -0400
commitc4cbf6b96100bbcd5da6e38b3334901b2eaa25bf (patch)
tree906e4de88d356f20df298acbb17c8b8b945acf99 /arch/ia64
parent3a72af09bca1666d53ddb0b05a9bdeef39e3f154 (diff)
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>
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/pci/pci.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 586cac1f47bb..2326790b7d8b 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -157,7 +157,7 @@ new_space (u64 phys_base, int sparse)
157 return i; 157 return i;
158 158
159 if (num_io_spaces == MAX_IO_SPACES) { 159 if (num_io_spaces == MAX_IO_SPACES) {
160 printk(KERN_ERR "PCI: Too many IO port spaces " 160 pr_err("PCI: Too many IO port spaces "
161 "(MAX_IO_SPACES=%lu)\n", MAX_IO_SPACES); 161 "(MAX_IO_SPACES=%lu)\n", MAX_IO_SPACES);
162 return ~0; 162 return ~0;
163 } 163 }
@@ -181,8 +181,9 @@ static u64 add_io_space(struct pci_root_info *info,
181 len = strlen(info->name) + 32; 181 len = strlen(info->name) + 32;
182 iospace = kzalloc(sizeof(*iospace) + len, GFP_KERNEL); 182 iospace = kzalloc(sizeof(*iospace) + len, GFP_KERNEL);
183 if (!iospace) { 183 if (!iospace) {
184 printk(KERN_ERR "PCI: No memory for %s I/O port space\n", 184 dev_err(&info->bridge->dev,
185 info->name); 185 "PCI: No memory for %s I/O port space\n",
186 info->name);
186 goto out; 187 goto out;
187 } 188 }
188 189
@@ -445,7 +446,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
445 446
446 info = kzalloc(sizeof(*info), GFP_KERNEL); 447 info = kzalloc(sizeof(*info), GFP_KERNEL);
447 if (!info) { 448 if (!info) {
448 printk(KERN_WARNING 449 dev_err(&device->dev,
449 "pci_bus %04x:%02x: ignored (out of memory)\n", 450 "pci_bus %04x:%02x: ignored (out of memory)\n",
450 domain, busnum); 451 domain, busnum);
451 kfree(controller); 452 kfree(controller);
@@ -781,7 +782,7 @@ static void __init set_pci_dfl_cacheline_size(void)
781 782
782 status = ia64_pal_cache_summary(&levels, &unique_caches); 783 status = ia64_pal_cache_summary(&levels, &unique_caches);
783 if (status != 0) { 784 if (status != 0) {
784 printk(KERN_ERR "%s: ia64_pal_cache_summary() failed " 785 pr_err("%s: ia64_pal_cache_summary() failed "
785 "(status=%ld)\n", __func__, status); 786 "(status=%ld)\n", __func__, status);
786 return; 787 return;
787 } 788 }
@@ -789,7 +790,7 @@ static void __init set_pci_dfl_cacheline_size(void)
789 status = ia64_pal_cache_config_info(levels - 1, 790 status = ia64_pal_cache_config_info(levels - 1,
790 /* cache_type (data_or_unified)= */ 2, &cci); 791 /* cache_type (data_or_unified)= */ 2, &cci);
791 if (status != 0) { 792 if (status != 0) {
792 printk(KERN_ERR "%s: ia64_pal_cache_config_info() failed " 793 pr_err("%s: ia64_pal_cache_config_info() failed "
793 "(status=%ld)\n", __func__, status); 794 "(status=%ld)\n", __func__, status);
794 return; 795 return;
795 } 796 }