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

Commit e3414786 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v3.13-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci 

Pull PCI updates from Bjorn Helgaas:
 "Miscellaneous
   - Remove duplicate disable from pcie_portdrv_remove() (Yinghai Lu)
   - Fix whitespace, capitalization, and spelling errors (Bjorn Helgaas)"

* tag 'pci-v3.13-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: Remove duplicate pci_disable_device() from pcie_portdrv_remove()
  PCI: Fix whitespace, capitalization, and spelling errors
parents b0e3636f e7cc5cf7

drivers/pci/ats.c

+1 −1
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ EXPORT_SYMBOL_GPL(pci_disable_pasid); 
 * Otherwise is returns a bitmask with supported features. Current

 * features reported are:

 * PCI_PASID_CAP_EXEC - Execute permission supported

 * PCI_PASID_CAP_PRIV - Priviledged mode supported

 * PCI_PASID_CAP_PRIV - Privileged mode supported

 */

int pci_pasid_features(struct pci_dev *pdev)

{

drivers/pci/host/pci-tegra.c

+6 −6
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ struct tegra_pcie { 
	void __iomem *afi;

	int irq;



	struct list_head busses;

	struct list_head buses;

	struct resource *cs;



	struct resource io;
@@ -399,14 +399,14 @@ static struct tegra_pcie_bus *tegra_pcie_bus_alloc(struct tegra_pcie *pcie, 


/*

 * Look up a virtual address mapping for the specified bus number. If no such

 * mapping existis, try to create one.

 * mapping exists, try to create one.

 */

static void __iomem *tegra_pcie_bus_map(struct tegra_pcie *pcie,

					unsigned int busnr)

{

	struct tegra_pcie_bus *bus;



	list_for_each_entry(bus, &pcie->busses, list)

	list_for_each_entry(bus, &pcie->buses, list)

		if (bus->nr == busnr)

			return (void __iomem *)bus->area->addr;
@@ -414,7 +414,7 @@ static void __iomem *tegra_pcie_bus_map(struct tegra_pcie *pcie, 
	if (IS_ERR(bus))

		return NULL;



	list_add_tail(&bus->list, &pcie->busses);

	list_add_tail(&bus->list, &pcie->buses);



	return (void __iomem *)bus->area->addr;

}
@@ -808,7 +808,7 @@ static int tegra_pcie_enable_controller(struct tegra_pcie *pcie) 
	value &= ~AFI_FUSE_PCIE_T0_GEN2_DIS;

	afi_writel(pcie, value, AFI_FUSE);



	/* initialze internal PHY, enable up to 16 PCIE lanes */

	/* initialize internal PHY, enable up to 16 PCIE lanes */

	pads_writel(pcie, 0x0, PADS_CTL_SEL);



	/* override IDDQ to 1 on all 4 lanes */
@@ -1624,7 +1624,7 @@ static int tegra_pcie_probe(struct platform_device *pdev) 
	if (!pcie)

		return -ENOMEM;



	INIT_LIST_HEAD(&pcie->busses);

	INIT_LIST_HEAD(&pcie->buses);

	INIT_LIST_HEAD(&pcie->ports);

	pcie->soc_data = match->data;

	pcie->dev = &pdev->dev;

drivers/pci/host/pcie-designware.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static int find_valid_pos0(struct pcie_port *pp, int msgvec, int pos, int *pos0) 
			return -ENOSPC;

		/*

		 * Check if this position is at correct offset.nvec is always a

		 * power of two. pos0 must be nvec bit alligned.

		 * power of two. pos0 must be nvec bit aligned.

		 */

		if (pos % msgvec)

			pos += msgvec - (pos % msgvec);

drivers/pci/hotplug/acpiphp_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ static acpi_status register_slot(acpi_handle handle, u32 lvl, void *data, 


	list_add_tail(&slot->node, &bridge->slots);



	/* Register slots for ejectable funtions only. */

	/* Register slots for ejectable functions only. */

	if (acpi_pci_check_ejectable(pbus, handle)  || is_dock_device(handle)) {

		unsigned long long sun;

		int retval;

drivers/pci/hotplug/acpiphp_ibm.c

+7 −7
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ static void ibm_handle_events(acpi_handle handle, u32 event, void *context) 
	pr_debug("%s: Received notification %02x\n", __func__, event);



	if (subevent == 0x80) {

		pr_debug("%s: generationg bus event\n", __func__);

		pr_debug("%s: generating bus event\n", __func__);

		acpi_bus_generate_netlink_event(note->device->pnp.device_class,

						  dev_name(&note->device->dev),

						  note->event, detail);