| Message ID | e1016eec-c059-47e5-8e01-539b1b48012a@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | PCI: Add and use pcim_iomap_region() | expand |
On Wed, 2024-03-27 at 12:54 +0100, Heiner Kallweit wrote: > Use new function pcim_iomap_region() to simplify the code. > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > --- > drivers/net/ethernet/realtek/r8169_main.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/ethernet/realtek/r8169_main.c > b/drivers/net/ethernet/realtek/r8169_main.c > index 5c879a5c8..7411cf1a1 100644 > --- a/drivers/net/ethernet/realtek/r8169_main.c > +++ b/drivers/net/ethernet/realtek/r8169_main.c > @@ -5333,11 +5333,9 @@ static int rtl_init_one(struct pci_dev *pdev, > const struct pci_device_id *ent) > if (region < 0) > return dev_err_probe(&pdev->dev, -ENODEV, "no MMIO > resource found\n"); > > - rc = pcim_iomap_regions(pdev, BIT(region), KBUILD_MODNAME); > - if (rc < 0) > - return dev_err_probe(&pdev->dev, rc, "cannot remap > MMIO, aborting\n"); > - > - tp->mmio_addr = pcim_iomap_table(pdev)[region]; > + tp->mmio_addr = pcim_iomap_region(pdev, region, > KBUILD_MODNAME); > + if (!tp->mmio_addr) > + return dev_err_probe(&pdev->dev, -ENOMEM, "cannot > remap MMIO, aborting\n"); > > txconfig = RTL_R32(tp, TxConfig); > if (txconfig == ~0U) You could use this patch then on top of my series; the only little change necessary would be that you have to check for an ERR_PTR: if (IS_ERR(tp->mmio_addr)) ... Looks very good otherwise. P.
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 5c879a5c8..7411cf1a1 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -5333,11 +5333,9 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) if (region < 0) return dev_err_probe(&pdev->dev, -ENODEV, "no MMIO resource found\n"); - rc = pcim_iomap_regions(pdev, BIT(region), KBUILD_MODNAME); - if (rc < 0) - return dev_err_probe(&pdev->dev, rc, "cannot remap MMIO, aborting\n"); - - tp->mmio_addr = pcim_iomap_table(pdev)[region]; + tp->mmio_addr = pcim_iomap_region(pdev, region, KBUILD_MODNAME); + if (!tp->mmio_addr) + return dev_err_probe(&pdev->dev, -ENOMEM, "cannot remap MMIO, aborting\n"); txconfig = RTL_R32(tp, TxConfig); if (txconfig == ~0U)
Use new function pcim_iomap_region() to simplify the code. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- drivers/net/ethernet/realtek/r8169_main.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)