Commit d91482bb authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

x86/PCI: Use pr_info() when possible 

Use pr_info() and similar when possible.  No functional change intended.

Link: https://lore.kernel.org/r/20221209205131.GA1726524@bhelgaas


Suggested-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent 2bfa89fa

arch/x86/pci/acpi.c

+18 −21
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



#define pr_fmt(fmt) "PCI: " fmt



#include <linux/pci.h>

#include <linux/acpi.h>

#include <linux/init.h>
@@ -37,14 +40,14 @@ static int __init set_nouse_crs(const struct dmi_system_id *id) 


static int __init set_ignore_seg(const struct dmi_system_id *id)

{

	printk(KERN_INFO "PCI: %s detected: ignoring ACPI _SEG\n", id->ident);

	pr_info("%s detected: ignoring ACPI _SEG\n", id->ident);

	pci_ignore_seg = true;

	return 0;

}



static int __init set_no_e820(const struct dmi_system_id *id)

{

	printk(KERN_INFO "PCI: %s detected: not clipping E820 regions from _CRS\n",

	pr_info("%s detected: not clipping E820 regions from _CRS\n",

	        id->ident);

	pci_use_e820 = false;

	return 0;
@@ -231,8 +234,7 @@ void __init pci_acpi_crs_quirks(void) 
	else if (pci_probe & PCI_USE__CRS)

		pci_use_crs = true;



	printk(KERN_INFO "PCI: %s host bridge windows from ACPI; "

	       "if necessary, use \"pci=%s\" and report a bug\n",

	pr_info("%s host bridge windows from ACPI; if necessary, use \"pci=%s\" and report a bug\n",

	        pci_use_crs ? "Using" : "Ignoring",

	        pci_use_crs ? "nocrs" : "use_crs");
@@ -242,19 +244,17 @@ void __init pci_acpi_crs_quirks(void) 
	else if (pci_probe & PCI_USE_E820)

		pci_use_e820 = true;



	printk(KERN_INFO "PCI: %s E820 reservations for host bridge windows\n",

	pr_info("%s E820 reservations for host bridge windows\n",

	        pci_use_e820 ? "Using" : "Ignoring");

	if (pci_probe & (PCI_NO_E820 | PCI_USE_E820))

		printk(KERN_INFO "PCI: Please notify linux-pci@vger.kernel.org so future kernels can do this automatically\n");

		pr_info("Please notify linux-pci@vger.kernel.org so future kernels can do this automatically\n");

}



#ifdef	CONFIG_PCI_MMCONFIG

static int check_segment(u16 seg, struct device *dev, char *estr)

{

	if (seg) {

		dev_err(dev,

			"%s can't access PCI configuration "

			"space under this host bridge.\n",

		dev_err(dev, "%s can't access configuration space under this host bridge\n",

			estr);

		return -EIO;

	}
@@ -264,9 +264,7 @@ static int check_segment(u16 seg, struct device *dev, char *estr) 
	 * just can't access extended configuration space of

	 * devices under this host bridge.

	 */

	dev_warn(dev,

		 "%s can't access extended PCI configuration "

		 "space under this bridge.\n",

	dev_warn(dev, "%s can't access extended configuration space under this bridge\n",

		 estr);



	return 0;
@@ -421,8 +419,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root) 
		root->segment = domain = 0;



	if (domain && !pci_domains_supported) {

		printk(KERN_WARNING "pci_bus %04x:%02x: "

		       "ignored (multiple domains not supported)\n",

		pr_warn("pci_bus %04x:%02x: ignored (multiple domains not supported)\n",

		        domain, busnum);

		return NULL;

	}
@@ -491,7 +488,7 @@ int __init pci_acpi_init(void) 
	if (acpi_noirq)

		return -ENODEV;



	printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n");

	pr_info("Using ACPI for IRQ routing\n");

	acpi_irq_penalty_init();

	pcibios_enable_irq = acpi_pci_irq_enable;

	pcibios_disable_irq = acpi_pci_irq_disable;
@@ -503,7 +500,7 @@ int __init pci_acpi_init(void) 
		 * also do it here in case there are still broken drivers that

		 * don't use pci_enable_device().

		 */

		printk(KERN_INFO "PCI: Routing PCI interrupts for all devices because \"pci=routeirq\" specified\n");

		pr_info("Routing PCI interrupts for all devices because \"pci=routeirq\" specified\n");

		for_each_pci_dev(dev)

			acpi_pci_irq_enable(dev);

	}