Commit 25da8dba authored by Mohan Kumar's avatar Mohan Kumar Committed by Bjorn Helgaas
Browse files

PCI: Replace printk(KERN_INFO) with pr_info(), etc 

Replace printk() with pr_*() to be more consistent with other logging and
avoid checkpatch warnings.

Link: https://lore.kernel.org/lkml/1555733026-19609-1-git-send-email-mohankumar718@gmail.com
Link: https://lore.kernel.org/lkml/1555733130-19804-1-git-send-email-mohankumar718@gmail.com


Signed-off-by: default avatarMohan Kumar <mohankumar718@gmail.com>
[bhelgaas: squash in similar changes from second patch in series]
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 7db4af43

drivers/pci/bus.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ void pci_add_resource_offset(struct list_head *resources, struct resource *res, 


	entry = resource_list_create_entry(res, 0);

	if (!entry) {

		printk(KERN_ERR "PCI: can't add host bridge window %pR\n", res);

		pr_err("PCI: can't add host bridge window %pR\n", res);

		return;

	}

drivers/pci/pci-acpi.c

+4 −7
Original line number Diff line number Diff line
@@ -140,8 +140,7 @@ static acpi_status decode_type0_hpx_record(union acpi_object *record, 
		hpx->t0->enable_perr     = fields[5].integer.value;

		break;

	default:

		printk(KERN_WARNING

		       "%s: Type 0 Revision %d record not supported\n",

		pr_warn("%s: Type 0 Revision %d record not supported\n",

		       __func__, revision);

		return AE_ERROR;

	}
@@ -169,8 +168,7 @@ static acpi_status decode_type1_hpx_record(union acpi_object *record, 
		hpx->t1->tot_max_split = fields[4].integer.value;

		break;

	default:

		printk(KERN_WARNING

		       "%s: Type 1 Revision %d record not supported\n",

		pr_warn("%s: Type 1 Revision %d record not supported\n",

		       __func__, revision);

		return AE_ERROR;

	}
@@ -211,8 +209,7 @@ static acpi_status decode_type2_hpx_record(union acpi_object *record, 
		hpx->t2->sec_unc_err_mask_or   = fields[17].integer.value;

		break;

	default:

		printk(KERN_WARNING

		       "%s: Type 2 Revision %d record not supported\n",

		pr_warn("%s: Type 2 Revision %d record not supported\n",

		       __func__, revision);

		return AE_ERROR;

	}
@@ -272,7 +269,7 @@ static acpi_status acpi_run_hpx(acpi_handle handle, struct hotplug_params *hpx) 
				goto exit;

			break;

		default:

			printk(KERN_ERR "%s: Type %d record not supported\n",

			pr_err("%s: Type %d record not supported\n",

			       __func__, type);

			status = AE_ERROR;

			goto exit;

drivers/pci/pci-stub.c

+4 −6
Original line number Diff line number Diff line
@@ -66,20 +66,18 @@ static int __init pci_stub_init(void) 
				&class, &class_mask);



		if (fields < 2) {

			printk(KERN_WARNING

			       "pci-stub: invalid id string \"%s\"\n", id);

			pr_warn("pci-stub: invalid ID string \"%s\"\n", id);

			continue;

		}



		printk(KERN_INFO

		       "pci-stub: add %04X:%04X sub=%04X:%04X cls=%08X/%08X\n",

		pr_info("pci-stub: add %04X:%04X sub=%04X:%04X cls=%08X/%08X\n",

		       vendor, device, subvendor, subdevice, class, class_mask);



		rc = pci_add_dynid(&stub_driver, vendor, device,

				   subvendor, subdevice, class, class_mask, 0);

		if (rc)

			printk(KERN_WARNING

			       "pci-stub: failed to add dynamic id (%d)\n", rc);

			pr_warn("pci-stub: failed to add dynamic ID (%d)\n",

				rc);

	}



	return 0;

drivers/pci/pci.c

+1 −2
Original line number Diff line number Diff line
@@ -6265,8 +6265,7 @@ static int __init pci_setup(char *str) 
				disable_acs_redir_param =

					kstrdup(str + 18, GFP_KERNEL);

			} else {

				printk(KERN_ERR "PCI: Unknown option `%s'\n",

						str);

				pr_err("PCI: Unknown option `%s'\n", str);

			}

		}

		str = k;

drivers/pci/quirks.c

+1 −1
Original line number Diff line number Diff line
@@ -2596,7 +2596,7 @@ static void nvbridge_check_legacy_irq_routing(struct pci_dev *dev) 
	pci_read_config_dword(dev, 0x74, &cfg);



	if (cfg & ((1 << 2) | (1 << 15))) {

		printk(KERN_INFO "Rewriting IRQ routing register on MCP55\n");

		pr_info("Rewriting IRQ routing register on MCP55\n");

		cfg &= ~((1 << 2) | (1 << 15));

		pci_write_config_dword(dev, 0x74, cfg);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE