PCI: pcie portdrv: remove unused variable

[deliverable/linux.git] / drivers / pci / pcie / portdrv_core.c

diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index e39982503863e4a1539d4f1f968a9dbf47bc3242..52f84fca9f7d4ded61c797b58323b23f6cc6bb90 100644 (file)
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -187,14 +187,9 @@ static int pcie_port_enable_msix(struct pci_dev *dev, int *vectors, int mask)
  */
 static int assign_interrupt_mode(struct pci_dev *dev, int *vectors, int mask)
 {
-       struct pcie_port_data *port_data = pci_get_drvdata(dev);
        int irq, interrupt_mode = PCIE_PORT_NO_IRQ;
        int i;
 
-       /* Check MSI quirk */
-       if (port_data->port_type == PCIE_RC_PORT && pcie_mch_quirk)
-               goto Fallback;
-
        /* Try to use MSI-X if supported */
        if (!pcie_port_enable_msix(dev, vectors, mask))
                return PCIE_PORT_MSIX_MODE;
@@ -203,7 +198,6 @@ static int assign_interrupt_mode(struct pci_dev *dev, int *vectors, int mask)
        if (!pci_enable_msi(dev))
                interrupt_mode = PCIE_PORT_MSI_MODE;
 
- Fallback:
        if (interrupt_mode == PCIE_PORT_NO_IRQ && dev->pin)
                interrupt_mode = PCIE_PORT_INTx_MODE;
 
@@ -275,7 +269,7 @@ static void pcie_device_init(struct pci_dev *parent, struct pcie_device *dev,
        memset(device, 0, sizeof(struct device));
        device->bus = &pcie_port_bus_type;
        device->driver = NULL;
-       device->driver_data = NULL;
+       dev_set_drvdata(device, NULL);
        device->release = release_pcie_device;  /* callback to free pcie dev */
        dev_set_name(device, "%s:pcie%02x",
                 pci_name(parent), get_descriptor_id(port_type, service_type));