Commit 192415f4 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/printk' 

* pci/printk:
  PCI: Replace dev_printk(KERN_DEBUG) with dev_info(), etc
  PCI: Replace printk(KERN_INFO) with pr_info(), etc
  PCI: Use dev_printk() when possible
parents f2e94683 34c6b710

drivers/pci/bus.c

+2 −3
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;

	}
@@ -288,8 +288,7 @@ bool pci_bus_clip_resource(struct pci_dev *dev, int idx) 
		res->end = end;

		res->flags &= ~IORESOURCE_UNSET;

		orig_res.flags &= ~IORESOURCE_UNSET;

		pci_printk(KERN_DEBUG, dev, "%pR clipped to %pR\n",

				 &orig_res, res);

		pci_info(dev, "%pR clipped to %pR\n", &orig_res, res);



		return true;

	}

drivers/pci/pci-acpi.c

+4 −7
Original line number Diff line number Diff line
@@ -139,8 +139,7 @@ static acpi_status decode_type0_hpx_record(union acpi_object *record, 
		hpx0->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;

	}
@@ -167,8 +166,7 @@ static acpi_status decode_type1_hpx_record(union acpi_object *record, 
		hpx1->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;

	}
@@ -208,8 +206,7 @@ static acpi_status decode_type2_hpx_record(union acpi_object *record, 
		hpx2->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;

	}
@@ -339,7 +336,7 @@ static acpi_status acpi_run_hpx(struct pci_dev *dev, acpi_handle handle, 
				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-sysfs.c

+1 −2
Original line number Diff line number Diff line
@@ -1111,8 +1111,7 @@ void pci_create_legacy_files(struct pci_bus *b) 
	kfree(b->legacy_io);

	b->legacy_io = NULL;

kzalloc_err:

	printk(KERN_WARNING "pci: warning: could not create legacy I/O port and ISA memory resources to sysfs\n");

	return;

	dev_warn(&b->dev, "could not create legacy I/O port and ISA memory resources in sysfs\n");

}



void pci_remove_legacy_files(struct pci_bus *b)

drivers/pci/pci.c

+8 −9
Original line number Diff line number Diff line
@@ -2777,14 +2777,14 @@ void pci_pm_init(struct pci_dev *dev) 
			dev->d2_support = true;



		if (dev->d1_support || dev->d2_support)

			pci_printk(KERN_DEBUG, dev, "supports%s%s\n",

			pci_info(dev, "supports%s%s\n",

				   dev->d1_support ? " D1" : "",

				   dev->d2_support ? " D2" : "");

	}



	pmc &= PCI_PM_CAP_PME_MASK;

	if (pmc) {

		pci_printk(KERN_DEBUG, dev, "PME# supported from%s%s%s%s%s\n",

		pci_info(dev, "PME# supported from%s%s%s%s%s\n",

			 (pmc & PCI_PM_CAP_PME_D0) ? " D0" : "",

			 (pmc & PCI_PM_CAP_PME_D1) ? " D1" : "",

			 (pmc & PCI_PM_CAP_PME_D2) ? " D2" : "",
@@ -2952,16 +2952,16 @@ static int pci_ea_read(struct pci_dev *dev, int offset) 
	res->flags = flags;



	if (bei <= PCI_EA_BEI_BAR5)

		pci_printk(KERN_DEBUG, dev, "BAR %d: %pR (from Enhanced Allocation, properties %#02x)\n",

		pci_info(dev, "BAR %d: %pR (from Enhanced Allocation, properties %#02x)\n",

			   bei, res, prop);

	else if (bei == PCI_EA_BEI_ROM)

		pci_printk(KERN_DEBUG, dev, "ROM: %pR (from Enhanced Allocation, properties %#02x)\n",

		pci_info(dev, "ROM: %pR (from Enhanced Allocation, properties %#02x)\n",

			   res, prop);

	else if (bei >= PCI_EA_BEI_VF_BAR0 && bei <= PCI_EA_BEI_VF_BAR5)

		pci_printk(KERN_DEBUG, dev, "VF BAR %d: %pR (from Enhanced Allocation, properties %#02x)\n",

		pci_info(dev, "VF BAR %d: %pR (from Enhanced Allocation, properties %#02x)\n",

			   bei - PCI_EA_BEI_VF_BAR0, res, prop);

	else

		pci_printk(KERN_DEBUG, dev, "BEI %d res: %pR (from Enhanced Allocation, properties %#02x)\n",

		pci_info(dev, "BEI %d res: %pR (from Enhanced Allocation, properties %#02x)\n",

			   bei, res, prop);



out:
@@ -4160,7 +4160,7 @@ int pci_set_cacheline_size(struct pci_dev *dev) 
	if (cacheline_size == pci_cache_line_size)

		return 0;



	pci_printk(KERN_DEBUG, dev, "cache line size of %d is not supported\n",

	pci_info(dev, "cache line size of %d is not supported\n",

		   pci_cache_line_size << 2);



	return -EINVAL;
@@ -6240,8 +6240,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;