Commit 33db87de authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/misc' into next 

* pci/misc:
  PCI: Fix PCIe capability sizes
  PCI: Convert to using %pOF instead of full_name()
  PCI: Constify endpoint pci_epf_type device_type
  PCI: Constify bin_attribute structures
  PCI: Constify hotplug pci_device_id structures
  PCI: Constify hotplug attribute_group structures
  PCI: Constify label attribute_group structures
  PCI: Constify sysfs attribute_group structures
parents d4fdf844 ea5311c7

drivers/pci/endpoint/pci-epf-core.c

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <linux/pci-ep-cfs.h>



static struct bus_type pci_epf_bus_type;

static struct device_type pci_epf_type;

static const struct device_type pci_epf_type;



/**

 * pci_epf_linkup() - Notify the function driver that EPC device has
@@ -291,7 +291,7 @@ static void pci_epf_dev_release(struct device *dev) 
	kfree(epf);

}



static struct device_type pci_epf_type = {

static const struct device_type pci_epf_type = {

	.release	= pci_epf_dev_release,

};

drivers/pci/host/pci-mvebu.c

+4 −4
Original line number Diff line number Diff line
@@ -1054,8 +1054,8 @@ static int mvebu_pcie_parse_port(struct mvebu_pcie *pcie, 
	port->pcie = pcie;



	if (of_property_read_u32(child, "marvell,pcie-port", &port->port)) {

		dev_warn(dev, "ignoring %s, missing pcie-port property\n",

			 of_node_full_name(child));

		dev_warn(dev, "ignoring %pOF, missing pcie-port property\n",

			 child);

		goto skip;

	}
@@ -1106,8 +1106,8 @@ static int mvebu_pcie_parse_port(struct mvebu_pcie *pcie, 
		}



		if (flags & OF_GPIO_ACTIVE_LOW) {

			dev_info(dev, "%s: reset gpio is active low\n",

				 of_node_full_name(child));

			dev_info(dev, "%pOF: reset gpio is active low\n",

				 child);

			gpio_flags = GPIOF_ACTIVE_LOW |

				     GPIOF_OUT_INIT_LOW;

		} else {

drivers/pci/host/pci-tegra.c

+1 −2
Original line number Diff line number Diff line
@@ -1703,8 +1703,7 @@ static int tegra_pcie_get_legacy_regulators(struct tegra_pcie *pcie) 
		pcie->num_supplies = 2;



	if (pcie->num_supplies == 0) {

		dev_err(dev, "device %s not supported in legacy mode\n",

			np->full_name);

		dev_err(dev, "device %pOF not supported in legacy mode\n", np);

		return -ENODEV;

	}

drivers/pci/hotplug/cpcihp_zt5550.c

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ static void zt5550_hc_remove_one(struct pci_dev *pdev) 
}





static struct pci_device_id zt5550_hc_pci_tbl[] = {

static const struct pci_device_id zt5550_hc_pci_tbl[] = {

	{ PCI_VENDOR_ID_ZIATECH, PCI_DEVICE_ID_ZIATECH_5550_HC, PCI_ANY_ID, PCI_ANY_ID, },

	{ 0, }

};

drivers/pci/hotplug/cpqphp_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1417,7 +1417,7 @@ static void __exit unload_cpqphpd(void) 
		iounmap(smbios_start);

}



static struct pci_device_id hpcd_pci_tbl[] = {

static const struct pci_device_id hpcd_pci_tbl[] = {

	{

	/* handle any PCI Hotplug controller */

	.class =        ((PCI_CLASS_SYSTEM_PCI_HOTPLUG << 8) | 0x00),

CRA Git | Maintained and supported by SUSTech CRA and CCSE