| Message ID | 20240325070944.3600338-10-dlemoal@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5133224938b9463d6a945ed102280a88b8867b67 |
| Headers | show |
| Series | Remove PCI_IRQ_LEGACY | expand |
On Mon, Mar 25, 2024 at 04:09:20PM +0900, Damien Le Moal wrote: > Use the macro PCI_IRQ_INTX instead of the deprecated PCI_IRQ_LEGACY > macro. Not needed anymore. MFD subsystem has a patch moving this to MSI support. But you need to coordinate with Lee how to proceed (in case of conflicts MFD version should be taken).
On Mon, Mar 25, 2024 at 09:39:38PM +0200, Andy Shevchenko wrote: > On Mon, Mar 25, 2024 at 04:09:20PM +0900, Damien Le Moal wrote: > > Use the macro PCI_IRQ_INTX instead of the deprecated PCI_IRQ_LEGACY > > macro. > > Not needed anymore. MFD subsystem has a patch moving this to MSI support. > But you need to coordinate with Lee how to proceed (in case of conflicts MFD > version should be taken). Thanks! It looks like your patch [1] has been applied already and makes this one obsolete, so I dropped this one from the series. Bjorn [1] https://lore.kernel.org/all/20240312165905.1764507-1-andriy.shevchenko@linux.intel.com/
On Mon, Mar 25, 2024 at 04:04:44PM -0500, Bjorn Helgaas wrote: > On Mon, Mar 25, 2024 at 09:39:38PM +0200, Andy Shevchenko wrote: > > On Mon, Mar 25, 2024 at 04:09:20PM +0900, Damien Le Moal wrote: > > > Use the macro PCI_IRQ_INTX instead of the deprecated PCI_IRQ_LEGACY > > > macro. > > > > Not needed anymore. MFD subsystem has a patch moving this to MSI support. > > But you need to coordinate with Lee how to proceed (in case of conflicts MFD > > version should be taken). > > Thanks! It looks like your patch [1] has been applied already and > makes this one obsolete, so I dropped this one from the series. I put this patch back in to prevent an ordering requirement between MFD and PCI. There will be a trivial merge conflict as Andy mentioned. > [1] https://lore.kernel.org/all/20240312165905.1764507-1-andriy.shevchenko@linux.intel.com/
diff --git a/drivers/mfd/intel-lpss-pci.c b/drivers/mfd/intel-lpss-pci.c index 8c00e0c695c5..9f4782bdbf4b 100644 --- a/drivers/mfd/intel-lpss-pci.c +++ b/drivers/mfd/intel-lpss-pci.c @@ -54,7 +54,7 @@ static int intel_lpss_pci_probe(struct pci_dev *pdev, if (ret) return ret; - ret = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_LEGACY); + ret = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_INTX); if (ret < 0) return ret;
Use the macro PCI_IRQ_INTX instead of the deprecated PCI_IRQ_LEGACY macro. Signed-off-by: Damien Le Moal <dlemoal@kernel.org> --- drivers/mfd/intel-lpss-pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)