Commit 38a61482 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branches 'pci/msi', 'pci/iommu' and 'pci/cleanup' into next 

* pci/msi:
  PCI/MSI: Fix memory leak in free_msi_irqs()

* pci/iommu:
  PCI: Add function 1 DMA alias quirk for HighPoint RocketRaid 642L
  PCI: Add bridge DMA alias quirk for ITE bridge

* pci/cleanup:
  PCI: Merge multi-line quoted strings
  PCI: Whitespace cleanup
  PCI: Move EXPORT_SYMBOL so it immediately follows function/variable
parents 843a85ce b701c0b1 c2e0fb96 227f0647

drivers/pci/access.c

+1 −4
Original line number Diff line number Diff line
@@ -231,10 +231,7 @@ static int pci_vpd_pci22_wait(struct pci_dev *dev) 
		}



		if (time_after(jiffies, timeout)) {

			dev_printk(KERN_DEBUG, &dev->dev,

				   "vpd r/w failed.  This is likely a firmware "

				   "bug on this device.  Contact the card "

				   "vendor for a firmware update.");

			dev_printk(KERN_DEBUG, &dev->dev, "vpd r/w failed.  This is likely a firmware bug on this device.  Contact the card vendor for a firmware update\n");

			return -ETIMEDOUT;

		}

		if (fatal_signal_pending(current))

drivers/pci/bus.c

+3 −3
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, 
					 type_mask, alignf, alignf_data,

					 &pci_32_bit);

}

EXPORT_SYMBOL(pci_bus_alloc_resource);



void __weak pcibios_resource_survey_bus(struct pci_bus *bus) { }
@@ -253,6 +254,7 @@ void pci_bus_add_device(struct pci_dev *dev) 


	dev->is_added = 1;

}

EXPORT_SYMBOL_GPL(pci_bus_add_device);



/**

 * pci_bus_add_devices - start driver for PCI devices
@@ -279,6 +281,7 @@ void pci_bus_add_devices(const struct pci_bus *bus) 
			pci_bus_add_devices(child);

	}

}

EXPORT_SYMBOL(pci_bus_add_devices);



/** pci_walk_bus - walk devices on/under bus, calling callback.

 *  @top      bus whose devices should be walked
@@ -344,6 +347,3 @@ void pci_bus_put(struct pci_bus *bus) 
}

EXPORT_SYMBOL(pci_bus_put);

EXPORT_SYMBOL(pci_bus_alloc_resource);

EXPORT_SYMBOL_GPL(pci_bus_add_device);

EXPORT_SYMBOL(pci_bus_add_devices);

drivers/pci/host/pci-mvebu.c

+9 −8
Original line number Diff line number Diff line
@@ -614,8 +614,8 @@ static inline struct mvebu_pcie *sys_to_pcie(struct pci_sys_data *sys) 
	return sys->private_data;

}



static struct mvebu_pcie_port *

mvebu_pcie_find_port(struct mvebu_pcie *pcie, struct pci_bus *bus,

static struct mvebu_pcie_port *mvebu_pcie_find_port(struct mvebu_pcie *pcie,

						    struct pci_bus *bus,

						    int devfn)

{

	int i;
@@ -834,7 +834,8 @@ static void mvebu_pcie_enable(struct mvebu_pcie *pcie) 
 * found, maps it.

 */

static void __iomem *mvebu_pcie_map_registers(struct platform_device *pdev,

		      struct device_node *np, struct mvebu_pcie_port *port)

					      struct device_node *np,

					      struct mvebu_pcie_port *port)

{

	struct resource regs;

	int ret = 0;

drivers/pci/host/pcie-rcar.c

+4 −6
Original line number Diff line number Diff line
@@ -277,9 +277,8 @@ static int rcar_pcie_read_conf(struct pci_bus *bus, unsigned int devfn, 
	else if (size == 2)

		*val = (*val >> (8 * (where & 2))) & 0xffff;



	dev_dbg(&bus->dev, "pcie-config-read: bus=%3d devfn=0x%04x "

		"where=0x%04x size=%d val=0x%08lx\n", bus->number,

		devfn, where, size, (unsigned long)*val);

	dev_dbg(&bus->dev, "pcie-config-read: bus=%3d devfn=0x%04x where=0x%04x size=%d val=0x%08lx\n",

		bus->number, devfn, where, size, (unsigned long)*val);



	return ret;

}
@@ -302,9 +301,8 @@ static int rcar_pcie_write_conf(struct pci_bus *bus, unsigned int devfn, 
	if (ret != PCIBIOS_SUCCESSFUL)

		return ret;



	dev_dbg(&bus->dev, "pcie-config-write: bus=%3d devfn=0x%04x "

		"where=0x%04x size=%d val=0x%08lx\n", bus->number,

		devfn, where, size, (unsigned long)val);

	dev_dbg(&bus->dev, "pcie-config-write: bus=%3d devfn=0x%04x where=0x%04x size=%d val=0x%08lx\n",

		bus->number, devfn, where, size, (unsigned long)val);



	if (size == 1) {

		shift = 8 * (where & 3);

drivers/pci/hotplug/acpiphp_core.c

+2 −4
Original line number Diff line number Diff line
@@ -63,10 +63,6 @@ MODULE_LICENSE("GPL"); 
MODULE_PARM_DESC(disable, "disable acpiphp driver");

module_param_named(disable, acpiphp_disabled, bool, 0444);



/* export the attention callback registration methods */

EXPORT_SYMBOL_GPL(acpiphp_register_attention);

EXPORT_SYMBOL_GPL(acpiphp_unregister_attention);



static int enable_slot		(struct hotplug_slot *slot);

static int disable_slot		(struct hotplug_slot *slot);

static int set_attention_status (struct hotplug_slot *slot, u8 value);
@@ -104,6 +100,7 @@ int acpiphp_register_attention(struct acpiphp_attention_info *info) 
	}

	return retval;

}

EXPORT_SYMBOL_GPL(acpiphp_register_attention);





/**
@@ -124,6 +121,7 @@ int acpiphp_unregister_attention(struct acpiphp_attention_info *info) 
	}

	return retval;

}

EXPORT_SYMBOL_GPL(acpiphp_unregister_attention);





/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE