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

Commit 0345d3f8 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' into next 

* pci/misc:
  PCI: Replace strict_strtoul() with kstrtoul()
  PCI: Fix comment typo for PCI_EXP_LNKCAP_CLKPM
  PCI: Replace printks with appropriate pr_*()
  PCI: Fix kerneldoc for pci_disable_link_state()
  x86/PCI: Increase info->res_num before checking pci_use_crs
  PCI: Fix INTC comment typo for pci_swizzle_interrupt_pin()
  PCI: Convert ioapic.c to module_pci_driver
parents b194dbf5 9a994e8e

arch/x86/pci/acpi.c

+2 −5
Original line number Diff line number Diff line
@@ -324,14 +324,11 @@ setup_resource(struct acpi_resource *acpi_res, void *data) 
	res->start = start;

	res->end = end;

	info->res_offset[info->res_num] = addr.translation_offset;

	info->res_num++;



	if (!pci_use_crs) {

	if (!pci_use_crs)

		dev_printk(KERN_DEBUG, &info->bridge->dev,

			   "host bridge window %pR (ignored)\n", res);

		return AE_OK;

	}



	info->res_num++;



	return AE_OK;

}

drivers/pci/ioapic.c

+1 −12
Original line number Diff line number Diff line
@@ -113,17 +113,6 @@ static struct pci_driver ioapic_driver = { 
	.remove		= ioapic_remove,

};



static int __init ioapic_init(void)

{

	return pci_register_driver(&ioapic_driver);

}



static void __exit ioapic_exit(void)

{

	pci_unregister_driver(&ioapic_driver);

}



module_init(ioapic_init);

module_exit(ioapic_exit);

module_pci_driver(ioapic_driver);



MODULE_LICENSE("GPL");

drivers/pci/pci-acpi.c

+2 −2
Original line number Diff line number Diff line
@@ -376,12 +376,12 @@ static int __init acpi_pci_init(void) 
	int ret;



	if (acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_MSI) {

		printk(KERN_INFO"ACPI FADT declares the system doesn't support MSI, so disable it\n");

		pr_info("ACPI FADT declares the system doesn't support MSI, so disable it\n");

		pci_no_msi();

	}



	if (acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_ASPM) {

		printk(KERN_INFO"ACPI FADT declares the system doesn't support PCIe ASPM, so disable it\n");

		pr_info("ACPI FADT declares the system doesn't support PCIe ASPM, so disable it\n");

		pcie_no_aspm();

	}

drivers/pci/pci-sysfs.c

+9 −9
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static ssize_t broken_parity_status_store(struct device *dev, 
	struct pci_dev *pdev = to_pci_dev(dev);

	unsigned long val;



	if (strict_strtoul(buf, 0, &val) < 0)

	if (kstrtoul(buf, 0, &val) < 0)

		return -EINVAL;



	pdev->broken_parity_status = !!val;
@@ -188,7 +188,7 @@ static ssize_t is_enabled_store(struct device *dev, 
{

	struct pci_dev *pdev = to_pci_dev(dev);

	unsigned long val;

	ssize_t result = strict_strtoul(buf, 0, &val);

	ssize_t result = kstrtoul(buf, 0, &val);



	if (result < 0)

		return result;
@@ -259,7 +259,7 @@ msi_bus_store(struct device *dev, struct device_attribute *attr, 
	struct pci_dev *pdev = to_pci_dev(dev);

	unsigned long val;



	if (strict_strtoul(buf, 0, &val) < 0)

	if (kstrtoul(buf, 0, &val) < 0)

		return -EINVAL;



	/* bad things may happen if the no_msi flag is changed
@@ -291,7 +291,7 @@ static ssize_t bus_rescan_store(struct bus_type *bus, const char *buf, 
	unsigned long val;

	struct pci_bus *b = NULL;



	if (strict_strtoul(buf, 0, &val) < 0)

	if (kstrtoul(buf, 0, &val) < 0)

		return -EINVAL;



	if (val) {
@@ -315,7 +315,7 @@ dev_rescan_store(struct device *dev, struct device_attribute *attr, 
	unsigned long val;

	struct pci_dev *pdev = to_pci_dev(dev);



	if (strict_strtoul(buf, 0, &val) < 0)

	if (kstrtoul(buf, 0, &val) < 0)

		return -EINVAL;



	if (val) {
@@ -342,7 +342,7 @@ remove_store(struct device *dev, struct device_attribute *dummy, 
	int ret = 0;

	unsigned long val;



	if (strict_strtoul(buf, 0, &val) < 0)

	if (kstrtoul(buf, 0, &val) < 0)

		return -EINVAL;



	/* An attribute cannot be unregistered by one of its own methods,
@@ -362,7 +362,7 @@ dev_bus_rescan_store(struct device *dev, struct device_attribute *attr, 
	unsigned long val;

	struct pci_bus *bus = to_pci_bus(dev);



	if (strict_strtoul(buf, 0, &val) < 0)

	if (kstrtoul(buf, 0, &val) < 0)

		return -EINVAL;



	if (val) {
@@ -384,7 +384,7 @@ static ssize_t d3cold_allowed_store(struct device *dev, 
	struct pci_dev *pdev = to_pci_dev(dev);

	unsigned long val;



	if (strict_strtoul(buf, 0, &val) < 0)

	if (kstrtoul(buf, 0, &val) < 0)

		return -EINVAL;



	pdev->d3cold_allowed = !!val;
@@ -1236,7 +1236,7 @@ static ssize_t reset_store(struct device *dev, 
{

	struct pci_dev *pdev = to_pci_dev(dev);

	unsigned long val;

	ssize_t result = strict_strtoul(buf, 0, &val);

	ssize_t result = kstrtoul(buf, 0, &val);



	if (result < 0)

		return result;

drivers/pci/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -2421,7 +2421,7 @@ bool pci_acs_path_enabled(struct pci_dev *start, 
/**

 * pci_swizzle_interrupt_pin - swizzle INTx for device behind bridge

 * @dev: the PCI device

 * @pin: the INTx pin (1=INTA, 2=INTB, 3=INTD, 4=INTD)

 * @pin: the INTx pin (1=INTA, 2=INTB, 3=INTC, 4=INTD)

 *

 * Perform INTx swizzling for a device behind one level of bridge.  This is

 * required by section 9.1 of the PCI-to-PCI bridge specification for devices