commit 2dd60e96b4d52bccd2dd585e776a3449d7b34b8f
author Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> Wed Nov 25 21:02:13 2009 +0900
committer Jesse Barnes <jbarnes@virtuousgeek.org> Fri Dec 04 15:55:26 2009 -0800
tree 917f339b7542be53ec3b64c12a221d5e6700eec1
parent 52a0f24beabe9e89223e367c65a0156dff17265c

PCI: portdrv: remove redundant pcie type calculation

PCIe port type is already stored in 'pcie_type' field of struct
pci_dev. So we don't need to get it from pci configuration space.

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

drivers/pci/pcie/portdrv_core.c

diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index 7ea37c0..42b21ee 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -291,19 +291,15 @@
 int pcie_port_device_register(struct pci_dev *dev)
 {
 	struct pcie_port_data *port_data;
-	int status, capabilities, irq_mode, i, nr_serv, pos;
+	int status, capabilities, irq_mode, i, nr_serv;
 	int vectors[PCIE_PORT_DEVICE_MAXSERVICES];
-	u16 reg16;
 
 	port_data = kzalloc(sizeof(*port_data), GFP_KERNEL);
 	if (!port_data)
 		return -ENOMEM;
 	pci_set_drvdata(dev, port_data);
 
-	/* Get port type */
-	pos = pci_pcie_cap(dev);
-	pci_read_config_word(dev, pos + PCIE_CAPABILITIES_REG, &reg16);
-	port_data->port_type = (reg16 >> 4) & PORT_TYPE_MASK;
+	port_data->port_type = dev->pcie_type;
 
 	capabilities = get_port_device_capability(dev);
 	/* Root ports are capable of generating PME too */