Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4cbf6b9 authored by Yijing Wang's avatar Yijing Wang Committed by Tony Luck
Browse files

PCI: Replace printks with appropriate pr_*() 



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

Signed-off-by: default avatarYijing 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: default avatarTony Luck <tony.luck@intel.com>
parent 3a72af09

arch/ia64/pci/pci.c

+7 −6
Original line number Original line Diff line number Diff line
@@ -157,7 +157,7 @@ new_space (u64 phys_base, int sparse) 
			return i;

			return i;





	if (num_io_spaces == MAX_IO_SPACES) {

	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);

			"(MAX_IO_SPACES=%lu)\n", MAX_IO_SPACES);

		return ~0;

		return ~0;

	}

	}
@@ -181,7 +181,8 @@ static u64 add_io_space(struct pci_root_info *info, 
	len = strlen(info->name) + 32;

	len = strlen(info->name) + 32;

	iospace = kzalloc(sizeof(*iospace) + len, GFP_KERNEL);

	iospace = kzalloc(sizeof(*iospace) + len, GFP_KERNEL);

	if (!iospace) {

	if (!iospace) {

		printk(KERN_ERR "PCI: No memory for %s I/O port space\n",

		dev_err(&info->bridge->dev,

				"PCI: No memory for %s I/O port space\n",

				info->name);

				info->name);

		goto out;

		goto out;

	}

	}
@@ -445,7 +446,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) 




	info = kzalloc(sizeof(*info), GFP_KERNEL);

	info = kzalloc(sizeof(*info), GFP_KERNEL);

	if (!info) {

	if (!info) {

		printk(KERN_WARNING

		dev_err(&device->dev,

				"pci_bus %04x:%02x: ignored (out of memory)\n",

				"pci_bus %04x:%02x: ignored (out of memory)\n",

				domain, busnum);

				domain, busnum);

		kfree(controller);

		kfree(controller);
@@ -781,7 +782,7 @@ static void __init set_pci_dfl_cacheline_size(void) 




	status = ia64_pal_cache_summary(&levels, &unique_caches);

	status = ia64_pal_cache_summary(&levels, &unique_caches);

	if (status != 0) {

	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);

			"(status=%ld)\n", __func__, status);

		return;

		return;

	}

	}
@@ -789,7 +790,7 @@ static void __init set_pci_dfl_cacheline_size(void) 
	status = ia64_pal_cache_config_info(levels - 1,

	status = ia64_pal_cache_config_info(levels - 1,

				/* cache_type (data_or_unified)= */ 2, &cci);

				/* cache_type (data_or_unified)= */ 2, &cci);

	if (status != 0) {

	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);

			"(status=%ld)\n", __func__, status);

		return;

		return;

	}

	}