Commit c2587420 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Andi Shyti

i2c: designware: Let PCI core to take care about interrupt vectors

PCI core, after pcim_enable_device(), takes care about the allocated
IRQ vectors, no need to do it explicitly and break the cleaning up
order.
Reviewed-by: default avatarAndi Shyti <andi.shyti@kernel.org>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Tested-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
parent 1a2b14e9
...@@ -295,10 +295,8 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev, ...@@ -295,10 +295,8 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev,
if (controller->setup) { if (controller->setup) {
r = controller->setup(pdev, controller); r = controller->setup(pdev, controller);
if (r) { if (r)
pci_free_irq_vectors(pdev);
return r; return r;
}
} }
i2c_dw_adjust_bus_speed(dev); i2c_dw_adjust_bus_speed(dev);
...@@ -307,10 +305,8 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev, ...@@ -307,10 +305,8 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev,
i2c_dw_acpi_configure(&pdev->dev); i2c_dw_acpi_configure(&pdev->dev);
r = i2c_dw_validate_speed(dev); r = i2c_dw_validate_speed(dev);
if (r) { if (r)
pci_free_irq_vectors(pdev);
return r; return r;
}
i2c_dw_configure(dev); i2c_dw_configure(dev);
...@@ -330,10 +326,8 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev, ...@@ -330,10 +326,8 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev,
adap->nr = controller->bus_num; adap->nr = controller->bus_num;
r = i2c_dw_probe(dev); r = i2c_dw_probe(dev);
if (r) { if (r)
pci_free_irq_vectors(pdev);
return r; return r;
}
if ((dev->flags & MODEL_MASK) == MODEL_AMD_NAVI_GPU) { if ((dev->flags & MODEL_MASK) == MODEL_AMD_NAVI_GPU) {
dev->slave = i2c_new_ccgx_ucsi(&dev->adapter, dev->irq, &dgpu_node); dev->slave = i2c_new_ccgx_ucsi(&dev->adapter, dev->irq, &dgpu_node);
...@@ -359,8 +353,6 @@ static void i2c_dw_pci_remove(struct pci_dev *pdev) ...@@ -359,8 +353,6 @@ static void i2c_dw_pci_remove(struct pci_dev *pdev)
pm_runtime_get_noresume(&pdev->dev); pm_runtime_get_noresume(&pdev->dev);
i2c_del_adapter(&dev->adapter); i2c_del_adapter(&dev->adapter);
devm_free_irq(&pdev->dev, dev->irq, dev);
pci_free_irq_vectors(pdev);
} }
static const struct pci_device_id i2_designware_pci_ids[] = { static const struct pci_device_id i2_designware_pci_ids[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment