| Message ID | 20241113124158.22863-13-pstanner@redhat.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Remove implicit devres from pci_intx() | expand |
On Wed, Nov 13 2024 at 13:41, Philipp Stanner wrote: > pci_intx() is a hybrid function which can sometimes be managed through > devres. This hybrid nature is undesirable. > > Since all users of pci_intx() have by now been ported either to > always-managed pcim_intx() or never-managed pci_intx_unmanaged(), the > devres functionality can be removed from pci_intx(). > > Consequently, pci_intx_unmanaged() is now redundant, because pci_intx() > itself is now unmanaged. > > Remove the devres functionality from pci_intx(). Have all users of > pci_intx_unmanaged() call pci_intx(). Remove pci_intx_unmanaged(). > > Signed-off-by: Philipp Stanner <pstanner@redhat.com> > --- > drivers/misc/cardreader/rtsx_pcr.c | 2 +- > drivers/misc/tifm_7xx1.c | 6 +-- > .../net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- > drivers/net/ethernet/brocade/bna/bnad.c | 2 +- > drivers/ntb/hw/amd/ntb_hw_amd.c | 4 +- > drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +- > drivers/pci/devres.c | 4 +- > drivers/pci/msi/api.c | 2 +- > drivers/pci/msi/msi.c | 2 +- > drivers/pci/pci.c | 43 +------------------ > drivers/vfio/pci/vfio_pci_core.c | 2 +- > drivers/vfio/pci/vfio_pci_intrs.c | 10 ++--- > drivers/xen/xen-pciback/conf_space_header.c | 2 +- > include/linux/pci.h | 1 - > 14 files changed, 22 insertions(+), 62 deletions(-) Now I'm utterly confused. This undoes the pci_intx_unmanaged() churn which you carefully split into several patches first. So the net change is that: 1) pci_intx() is now always unmanaged 2) a couple of drivers use pcim_intx() now instead of pci_intx() The obvious ordering is: 1) Convert the drivers which need the managed version to use pcim_intx() 2) Remove the managed warning in pci_intx() and clean up the comment 3) Remove __pcim_intx() and invoke pci_intx() in the devres code. No? Thanks, tglx
On Wed, 2024-11-13 at 17:22 +0100, Thomas Gleixner wrote: > On Wed, Nov 13 2024 at 13:41, Philipp Stanner wrote: > > pci_intx() is a hybrid function which can sometimes be managed > > through > > devres. This hybrid nature is undesirable. > > > > Since all users of pci_intx() have by now been ported either to > > always-managed pcim_intx() or never-managed pci_intx_unmanaged(), > > the > > devres functionality can be removed from pci_intx(). > > > > Consequently, pci_intx_unmanaged() is now redundant, because > > pci_intx() > > itself is now unmanaged. > > > > Remove the devres functionality from pci_intx(). Have all users of > > pci_intx_unmanaged() call pci_intx(). Remove pci_intx_unmanaged(). > > > > Signed-off-by: Philipp Stanner <pstanner@redhat.com> > > --- > > drivers/misc/cardreader/rtsx_pcr.c | 2 +- > > drivers/misc/tifm_7xx1.c | 6 +-- > > .../net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- > > drivers/net/ethernet/brocade/bna/bnad.c | 2 +- > > drivers/ntb/hw/amd/ntb_hw_amd.c | 4 +- > > drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +- > > drivers/pci/devres.c | 4 +- > > drivers/pci/msi/api.c | 2 +- > > drivers/pci/msi/msi.c | 2 +- > > drivers/pci/pci.c | 43 +-------------- > > ---- > > drivers/vfio/pci/vfio_pci_core.c | 2 +- > > drivers/vfio/pci/vfio_pci_intrs.c | 10 ++--- > > drivers/xen/xen-pciback/conf_space_header.c | 2 +- > > include/linux/pci.h | 1 - > > 14 files changed, 22 insertions(+), 62 deletions(-) > > Now I'm utterly confused. This undoes the pci_intx_unmanaged() churn > which you carefully split into several patches first. Have you read the email I have linked? There is also the cover-letter (does anyone in the community ever read those?) which explicitly states: "Patch "Remove devres from pci_intx()" obviously reverts the previous patches that made drivers use pci_intx_unmanaged(). But this way it's easier to review and approve. It also makes sure that each checked out commit should provide correct behavior, not just the entire series as a whole." P. > > So the net change is that: > > 1) pci_intx() is now always unmanaged > > 2) a couple of drivers use pcim_intx() now instead of pci_intx() > > The obvious ordering is: > > 1) Convert the drivers which need the managed version to use > pcim_intx() > > 2) Remove the managed warning in pci_intx() and clean up the > comment > > 3) Remove __pcim_intx() and invoke pci_intx() in the devres code. > > No? > > Thanks, > > tglx >
On Thu, Nov 14 2024 at 10:05, Philipp Stanner wrote: > On Wed, 2024-11-13 at 17:22 +0100, Thomas Gleixner wrote: >> On Wed, Nov 13 2024 at 13:41, Philipp Stanner wrote: >> > pci_intx() is a hybrid function which can sometimes be managed >> > through >> > devres. This hybrid nature is undesirable. >> > >> > Since all users of pci_intx() have by now been ported either to >> > always-managed pcim_intx() or never-managed pci_intx_unmanaged(), >> > the >> > devres functionality can be removed from pci_intx(). >> > >> > Consequently, pci_intx_unmanaged() is now redundant, because >> > pci_intx() >> > itself is now unmanaged. >> > >> > Remove the devres functionality from pci_intx(). Have all users of >> > pci_intx_unmanaged() call pci_intx(). Remove pci_intx_unmanaged(). >> > >> > Signed-off-by: Philipp Stanner <pstanner@redhat.com> >> > --- >> > drivers/misc/cardreader/rtsx_pcr.c | 2 +- >> > drivers/misc/tifm_7xx1.c | 6 +-- >> > .../net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- >> > drivers/net/ethernet/brocade/bna/bnad.c | 2 +- >> > drivers/ntb/hw/amd/ntb_hw_amd.c | 4 +- >> > drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +- >> > drivers/pci/devres.c | 4 +- >> > drivers/pci/msi/api.c | 2 +- >> > drivers/pci/msi/msi.c | 2 +- >> > drivers/pci/pci.c | 43 +-------------- >> > ---- >> > drivers/vfio/pci/vfio_pci_core.c | 2 +- >> > drivers/vfio/pci/vfio_pci_intrs.c | 10 ++--- >> > drivers/xen/xen-pciback/conf_space_header.c | 2 +- >> > include/linux/pci.h | 1 - >> > 14 files changed, 22 insertions(+), 62 deletions(-) >> >> Now I'm utterly confused. This undoes the pci_intx_unmanaged() churn >> which you carefully split into several patches first. > > Have you read the email I have linked? > > There is also the cover-letter (does anyone in the community ever read > those?) which explicitly states: > > "Patch "Remove devres from pci_intx()" obviously reverts the previous > patches that made drivers use pci_intx_unmanaged(). But this way it's > easier to review and approve. It also makes sure that each checked out > commit should provide correct behavior, not just the entire series as a > whole." I read it and I assume your intention was to force an eye on every use case of pci_intx() and not just on those which need to be converted to pcim_intx(). I'm not convinced that this is needed, but fair enough.
On Fri, 2024-11-15 at 01:46 +0100, Thomas Gleixner wrote: > On Thu, Nov 14 2024 at 10:05, Philipp Stanner wrote: > > On Wed, 2024-11-13 at 17:22 +0100, Thomas Gleixner wrote: > > > On Wed, Nov 13 2024 at 13:41, Philipp Stanner wrote: > > > > pci_intx() is a hybrid function which can sometimes be managed > > > > through > > > > devres. This hybrid nature is undesirable. > > > > > > > > Since all users of pci_intx() have by now been ported either to > > > > always-managed pcim_intx() or never-managed > > > > pci_intx_unmanaged(), > > > > the > > > > devres functionality can be removed from pci_intx(). > > > > > > > > Consequently, pci_intx_unmanaged() is now redundant, because > > > > pci_intx() > > > > itself is now unmanaged. > > > > > > > > Remove the devres functionality from pci_intx(). Have all users > > > > of > > > > pci_intx_unmanaged() call pci_intx(). Remove > > > > pci_intx_unmanaged(). > > > > > > > > Signed-off-by: Philipp Stanner <pstanner@redhat.com> > > > > --- > > > > drivers/misc/cardreader/rtsx_pcr.c | 2 +- > > > > drivers/misc/tifm_7xx1.c | 6 +-- > > > > .../net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- > > > > drivers/net/ethernet/brocade/bna/bnad.c | 2 +- > > > > drivers/ntb/hw/amd/ntb_hw_amd.c | 4 +- > > > > drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +- > > > > drivers/pci/devres.c | 4 +- > > > > drivers/pci/msi/api.c | 2 +- > > > > drivers/pci/msi/msi.c | 2 +- > > > > drivers/pci/pci.c | 43 +---------- > > > > ---- > > > > ---- > > > > drivers/vfio/pci/vfio_pci_core.c | 2 +- > > > > drivers/vfio/pci/vfio_pci_intrs.c | 10 ++--- > > > > drivers/xen/xen-pciback/conf_space_header.c | 2 +- > > > > include/linux/pci.h | 1 - > > > > 14 files changed, 22 insertions(+), 62 deletions(-) > > > > > > Now I'm utterly confused. This undoes the pci_intx_unmanaged() > > > churn > > > which you carefully split into several patches first. > > > > Have you read the email I have linked? > > > > There is also the cover-letter (does anyone in the community ever > > read > > those?) which explicitly states: > > > > "Patch "Remove devres from pci_intx()" obviously reverts the > > previous > > patches that made drivers use pci_intx_unmanaged(). But this way > > it's > > easier to review and approve. It also makes sure that each checked > > out > > commit should provide correct behavior, not just the entire series > > as a > > whole." > > I read it and I assume your intention was to force an eye on every > use > case of pci_intx() and not just on those which need to be converted > to > pcim_intx(). > > I'm not convinced that this is needed, but fair enough. Whether pcim_enable_device() is really not used could have been overlooked, or the driver could move to "managed mode" in parallel for v6.13 for example. Then a bug would be silently introduced into those drivers. Besides, me touching pci_intx() unfortunately caused a few explosions in the past already, in fc8c818e756991f5f50b8dfab07f970a18da2556 and 00f89ae4e759a7eef07e4188e1534af7dd2c7e9c So this time I prefer to be rather safe than sorry. BTW, if you can review the MSI patch and check whether removing devres from there really is fine, that would be helpful. Regards, P.
diff --git a/drivers/misc/cardreader/rtsx_pcr.c b/drivers/misc/cardreader/rtsx_pcr.c index e25e6d560dd7..be3d4e0e50cc 100644 --- a/drivers/misc/cardreader/rtsx_pcr.c +++ b/drivers/misc/cardreader/rtsx_pcr.c @@ -1057,7 +1057,7 @@ static int rtsx_pci_acquire_irq(struct rtsx_pcr *pcr) } pcr->irq = pcr->pci->irq; - pci_intx_unmanaged(pcr->pci, !pcr->msi_en); + pci_intx(pcr->pci, !pcr->msi_en); return 0; } diff --git a/drivers/misc/tifm_7xx1.c b/drivers/misc/tifm_7xx1.c index 5f9c7ccae8d2..1d54680d6ed2 100644 --- a/drivers/misc/tifm_7xx1.c +++ b/drivers/misc/tifm_7xx1.c @@ -327,7 +327,7 @@ static int tifm_7xx1_probe(struct pci_dev *dev, goto err_out; } - pci_intx_unmanaged(dev, 1); + pci_intx(dev, 1); fm = tifm_alloc_adapter(dev->device == PCI_DEVICE_ID_TI_XX21_XX11_FM ? 4 : 2, &dev->dev); @@ -368,7 +368,7 @@ static int tifm_7xx1_probe(struct pci_dev *dev, err_out_free: tifm_free_adapter(fm); err_out_int: - pci_intx_unmanaged(dev, 0); + pci_intx(dev, 0); pci_release_regions(dev); err_out: if (!pci_dev_busy) @@ -392,7 +392,7 @@ static void tifm_7xx1_remove(struct pci_dev *dev) tifm_7xx1_sock_power_off(tifm_7xx1_sock_addr(fm->addr, cnt)); iounmap(fm->addr); - pci_intx_unmanaged(dev, 0); + pci_intx(dev, 0); pci_release_regions(dev); pci_disable_device(dev); diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index 2ae63d6e6792..678829646cec 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -1669,7 +1669,7 @@ static void bnx2x_igu_int_enable(struct bnx2x *bp) REG_WR(bp, IGU_REG_PF_CONFIGURATION, val); if (val & IGU_PF_CONF_INT_LINE_EN) - pci_intx_unmanaged(bp->pdev, true); + pci_intx(bp->pdev, true); barrier(); diff --git a/drivers/net/ethernet/brocade/bna/bnad.c b/drivers/net/ethernet/brocade/bna/bnad.c index 2b37462d406e..ece6f3b48327 100644 --- a/drivers/net/ethernet/brocade/bna/bnad.c +++ b/drivers/net/ethernet/brocade/bna/bnad.c @@ -2669,7 +2669,7 @@ bnad_enable_msix(struct bnad *bnad) } } - pci_intx_unmanaged(bnad->pcidev, 0); + pci_intx(bnad->pcidev, 0); return; diff --git a/drivers/ntb/hw/amd/ntb_hw_amd.c b/drivers/ntb/hw/amd/ntb_hw_amd.c index b146f170e839..d687e8c2cc78 100644 --- a/drivers/ntb/hw/amd/ntb_hw_amd.c +++ b/drivers/ntb/hw/amd/ntb_hw_amd.c @@ -791,7 +791,7 @@ static int ndev_init_isr(struct amd_ntb_dev *ndev, err_msi_enable: /* Try to set up intx irq */ - pci_intx_unmanaged(pdev, 1); + pci_intx(pdev, 1); rc = request_irq(pdev->irq, ndev_irq_isr, IRQF_SHARED, "ndev_irq_isr", ndev); @@ -831,7 +831,7 @@ static void ndev_deinit_isr(struct amd_ntb_dev *ndev) if (pci_dev_msi_enabled(pdev)) pci_disable_msi(pdev); else - pci_intx_unmanaged(pdev, 0); + pci_intx(pdev, 0); } } diff --git a/drivers/ntb/hw/intel/ntb_hw_gen1.c b/drivers/ntb/hw/intel/ntb_hw_gen1.c index 9ad9d7fe227e..079b8cd79785 100644 --- a/drivers/ntb/hw/intel/ntb_hw_gen1.c +++ b/drivers/ntb/hw/intel/ntb_hw_gen1.c @@ -445,7 +445,7 @@ int ndev_init_isr(struct intel_ntb_dev *ndev, /* Try to set up intx irq */ - pci_intx_unmanaged(pdev, 1); + pci_intx(pdev, 1); rc = request_irq(pdev->irq, ndev_irq_isr, IRQF_SHARED, "ndev_irq_isr", ndev); diff --git a/drivers/pci/devres.c b/drivers/pci/devres.c index d32827a1f2f4..6f8f712fe34e 100644 --- a/drivers/pci/devres.c +++ b/drivers/pci/devres.c @@ -416,7 +416,7 @@ static void pcim_intx_restore(struct device *dev, void *data) struct pci_dev *pdev = to_pci_dev(dev); struct pcim_intx_devres *res = data; - pci_intx_unmanaged(pdev, res->orig_intx); + pci_intx(pdev, res->orig_intx); } static struct pcim_intx_devres *get_or_create_intx_devres(struct device *dev) @@ -453,7 +453,7 @@ int pcim_intx(struct pci_dev *pdev, int enable) return -ENOMEM; res->orig_intx = !enable; - pci_intx_unmanaged(pdev, enable); + pci_intx(pdev, enable); return 0; } diff --git a/drivers/pci/msi/api.c b/drivers/pci/msi/api.c index c95e2e7dc9ab..b956ce591f96 100644 --- a/drivers/pci/msi/api.c +++ b/drivers/pci/msi/api.c @@ -289,7 +289,7 @@ int pci_alloc_irq_vectors_affinity(struct pci_dev *dev, unsigned int min_vecs, */ if (affd) irq_create_affinity_masks(1, affd); - pci_intx_unmanaged(dev, 1); + pci_intx(dev, 1); return 1; } } diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c index 53f13b09db50..3a45879d85db 100644 --- a/drivers/pci/msi/msi.c +++ b/drivers/pci/msi/msi.c @@ -268,7 +268,7 @@ EXPORT_SYMBOL_GPL(pci_write_msi_msg); static void pci_intx_for_msi(struct pci_dev *dev, int enable) { if (!(dev->dev_flags & PCI_DEV_FLAGS_MSI_INTX_DISABLE_BUG)) - pci_intx_unmanaged(dev, enable); + pci_intx(dev, enable); } static void pci_msi_set_enable(struct pci_dev *dev, int enable) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index c945811b207a..df537c6f383d 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4481,17 +4481,13 @@ void pci_disable_parity(struct pci_dev *dev) } /** - * pci_intx_unmanaged - enables/disables PCI INTx for device dev, - * unmanaged version + * pci_intx - enables/disables PCI INTx for device dev * @pdev: the PCI device to operate on * @enable: boolean: whether to enable or disable PCI INTx * * Enables/disables PCI INTx for device @pdev - * - * This function behavios identically to pci_intx(), but is never managed with - * devres. */ -void pci_intx_unmanaged(struct pci_dev *pdev, int enable) +void pci_intx(struct pci_dev *pdev, int enable) { u16 pci_command, new; @@ -4507,41 +4503,6 @@ void pci_intx_unmanaged(struct pci_dev *pdev, int enable) pci_write_config_word(pdev, PCI_COMMAND, new); } -EXPORT_SYMBOL_GPL(pci_intx_unmanaged); - -/** - * pci_intx - enables/disables PCI INTx for device dev - * @pdev: the PCI device to operate on - * @enable: boolean: whether to enable or disable PCI INTx - * - * Enables/disables PCI INTx for device @pdev - * - * NOTE: - * This is a "hybrid" function: It's normally unmanaged, but becomes managed - * when pcim_enable_device() has been called in advance. This hybrid feature is - * DEPRECATED! If you want managed cleanup, use pcim_intx() instead. - */ -void pci_intx(struct pci_dev *pdev, int enable) -{ - u16 pci_command, new; - - pci_read_config_word(pdev, PCI_COMMAND, &pci_command); - - if (enable) - new = pci_command & ~PCI_COMMAND_INTX_DISABLE; - else - new = pci_command | PCI_COMMAND_INTX_DISABLE; - - if (new != pci_command) { - /* Preserve the "hybrid" behavior for backwards compatibility */ - if (pci_is_managed(pdev)) { - WARN_ON_ONCE(pcim_intx(pdev, enable) != 0); - return; - } - - pci_write_config_word(pdev, PCI_COMMAND, new); - } -} EXPORT_SYMBOL_GPL(pci_intx); /** diff --git a/drivers/vfio/pci/vfio_pci_core.c b/drivers/vfio/pci/vfio_pci_core.c index 90240c8d51aa..1ab58da9f38a 100644 --- a/drivers/vfio/pci/vfio_pci_core.c +++ b/drivers/vfio/pci/vfio_pci_core.c @@ -498,7 +498,7 @@ int vfio_pci_core_enable(struct vfio_pci_core_device *vdev) if (vfio_pci_nointx(pdev)) { pci_info(pdev, "Masking broken INTx support\n"); vdev->nointx = true; - pci_intx_unmanaged(pdev, 0); + pci_intx(pdev, 0); } else vdev->pci_2_3 = pci_intx_mask_supported(pdev); } diff --git a/drivers/vfio/pci/vfio_pci_intrs.c b/drivers/vfio/pci/vfio_pci_intrs.c index 40abb0b937a2..8382c5834335 100644 --- a/drivers/vfio/pci/vfio_pci_intrs.c +++ b/drivers/vfio/pci/vfio_pci_intrs.c @@ -118,7 +118,7 @@ static bool __vfio_pci_intx_mask(struct vfio_pci_core_device *vdev) */ if (unlikely(!is_intx(vdev))) { if (vdev->pci_2_3) - pci_intx_unmanaged(pdev, 0); + pci_intx(pdev, 0); goto out_unlock; } @@ -132,7 +132,7 @@ static bool __vfio_pci_intx_mask(struct vfio_pci_core_device *vdev) * mask, not just when something is pending. */ if (vdev->pci_2_3) - pci_intx_unmanaged(pdev, 0); + pci_intx(pdev, 0); else disable_irq_nosync(pdev->irq); @@ -178,7 +178,7 @@ static int vfio_pci_intx_unmask_handler(void *opaque, void *data) */ if (unlikely(!is_intx(vdev))) { if (vdev->pci_2_3) - pci_intx_unmanaged(pdev, 1); + pci_intx(pdev, 1); goto out_unlock; } @@ -296,7 +296,7 @@ static int vfio_intx_enable(struct vfio_pci_core_device *vdev, */ ctx->masked = vdev->virq_disabled; if (vdev->pci_2_3) { - pci_intx_unmanaged(pdev, !ctx->masked); + pci_intx(pdev, !ctx->masked); irqflags = IRQF_SHARED; } else { irqflags = ctx->masked ? IRQF_NO_AUTOEN : 0; @@ -569,7 +569,7 @@ static void vfio_msi_disable(struct vfio_pci_core_device *vdev, bool msix) * via their shutdown paths. Restore for NoINTx devices. */ if (vdev->nointx) - pci_intx_unmanaged(pdev, 0); + pci_intx(pdev, 0); vdev->irq_type = VFIO_PCI_NUM_IRQS; } diff --git a/drivers/xen/xen-pciback/conf_space_header.c b/drivers/xen/xen-pciback/conf_space_header.c index 8d26d64232e8..fc0332645966 100644 --- a/drivers/xen/xen-pciback/conf_space_header.c +++ b/drivers/xen/xen-pciback/conf_space_header.c @@ -106,7 +106,7 @@ static int command_write(struct pci_dev *dev, int offset, u16 value, void *data) if (dev_data && dev_data->allow_interrupt_control && ((cmd->val ^ value) & PCI_COMMAND_INTX_DISABLE)) - pci_intx_unmanaged(dev, !(value & PCI_COMMAND_INTX_DISABLE)); + pci_intx(dev, !(value & PCI_COMMAND_INTX_DISABLE)); cmd->val = value; diff --git a/include/linux/pci.h b/include/linux/pci.h index 6b8cde76d564..1b2a6dd1dfed 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1353,7 +1353,6 @@ int __must_check pcim_set_mwi(struct pci_dev *dev); int pci_try_set_mwi(struct pci_dev *dev); void pci_clear_mwi(struct pci_dev *dev); void pci_disable_parity(struct pci_dev *dev); -void pci_intx_unmanaged(struct pci_dev *pdev, int enable); void pci_intx(struct pci_dev *dev, int enable); bool pci_check_and_mask_intx(struct pci_dev *dev); bool pci_check_and_unmask_intx(struct pci_dev *dev);
pci_intx() is a hybrid function which can sometimes be managed through devres. This hybrid nature is undesirable. Since all users of pci_intx() have by now been ported either to always-managed pcim_intx() or never-managed pci_intx_unmanaged(), the devres functionality can be removed from pci_intx(). Consequently, pci_intx_unmanaged() is now redundant, because pci_intx() itself is now unmanaged. Remove the devres functionality from pci_intx(). Have all users of pci_intx_unmanaged() call pci_intx(). Remove pci_intx_unmanaged(). Signed-off-by: Philipp Stanner <pstanner@redhat.com> --- drivers/misc/cardreader/rtsx_pcr.c | 2 +- drivers/misc/tifm_7xx1.c | 6 +-- .../net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- drivers/net/ethernet/brocade/bna/bnad.c | 2 +- drivers/ntb/hw/amd/ntb_hw_amd.c | 4 +- drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +- drivers/pci/devres.c | 4 +- drivers/pci/msi/api.c | 2 +- drivers/pci/msi/msi.c | 2 +- drivers/pci/pci.c | 43 +------------------ drivers/vfio/pci/vfio_pci_core.c | 2 +- drivers/vfio/pci/vfio_pci_intrs.c | 10 ++--- drivers/xen/xen-pciback/conf_space_header.c | 2 +- include/linux/pci.h | 1 - 14 files changed, 22 insertions(+), 62 deletions(-)