r8169: use dev_err_probe in all appropriate places in rtl_init_one()

In addition to properly handling probe deferrals dev_err_probe()
conveniently combines printing an error message with returning
the errno. So let's use it for every error path in rtl_init_one()
to simplify the code.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Link: https://lore.kernel.org/r/f0596a19-d517-e301-b649-304f9247b75a@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 5e6308d..9445f04 100644 (file)
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -5196,44 +5196,35 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        /* enable device (incl. PCI PM wakeup and hotplug setup) */
        rc = pcim_enable_device(pdev);
-       if (rc < 0) {
-               dev_err(&pdev->dev, "enable failure\n");
-               return rc;
-       }
+       if (rc < 0)
+               return dev_err_probe(&pdev->dev, rc, "enable failure\n");
 
        if (pcim_set_mwi(pdev) < 0)
                dev_info(&pdev->dev, "Mem-Wr-Inval unavailable\n");
 
        /* use first MMIO region */
        region = ffs(pci_select_bars(pdev, IORESOURCE_MEM)) - 1;
-       if (region < 0) {
-               dev_err(&pdev->dev, "no MMIO resource found\n");
-               return -ENODEV;
-       }
+       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) {
-               dev_err(&pdev->dev, "cannot remap MMIO, aborting\n");
-               return rc;
-       }
+       if (rc < 0)
+               return dev_err_probe(&pdev->dev, rc, "cannot remap MMIO, aborting\n");
 
        tp->mmio_addr = pcim_iomap_table(pdev)[region];
 
        txconfig = RTL_R32(tp, TxConfig);
-       if (txconfig == ~0U) {
-               dev_err(&pdev->dev, "PCI read failed\n");
-               return -EIO;
-       }
+       if (txconfig == ~0U)
+               return dev_err_probe(&pdev->dev, -EIO, "PCI read failed\n");
 
        xid = (txconfig >> 20) & 0xfcf;
 
        /* Identify chip attached to board */
        chipset = rtl8169_get_mac_version(xid, tp->supports_gmii);
-       if (chipset == RTL_GIGA_MAC_NONE) {
-               dev_err(&pdev->dev, "unknown chip XID %03x, contact r8169 maintainers (see MAINTAINERS file)\n", xid);
-               return -ENODEV;
-       }
-
+       if (chipset == RTL_GIGA_MAC_NONE)
+               return dev_err_probe(&pdev->dev, -ENODEV,
+                                    "unknown chip XID %03x, contact r8169 maintainers (see MAINTAINERS file)\n",
+                                    xid);
        tp->mac_version = chipset;
 
        tp->dash_type = rtl_check_dash(tp);
@@ -5253,10 +5244,9 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        rtl_hw_reset(tp);
 
        rc = rtl_alloc_irq(tp);
-       if (rc < 0) {
-               dev_err(&pdev->dev, "Can't allocate interrupt\n");
-               return rc;
-       }
+       if (rc < 0)
+               return dev_err_probe(&pdev->dev, rc, "Can't allocate interrupt\n");
+
        tp->irq = pci_irq_vector(pdev, 0);
 
        INIT_WORK(&tp->wk.work, rtl_task);