From patchwork Sat Dec 9 23:43:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 846633 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gky4eGPi"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yvQm91hWNz9sQm for ; Sun, 10 Dec 2017 10:44:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751263AbdLIXoA (ORCPT ); Sat, 9 Dec 2017 18:44:00 -0500 Received: from mail-wr0-f195.google.com ([209.85.128.195]:35424 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751190AbdLIXn7 (ORCPT ); Sat, 9 Dec 2017 18:43:59 -0500 Received: by mail-wr0-f195.google.com with SMTP id g53so14057068wra.2; Sat, 09 Dec 2017 15:43:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=f5iG+de+Y2N7KTl2YkSdchniBmkQu5qz58wpWqM2ez8=; b=gky4eGPiq2V0WPhqJ2FYFDkm2viLKjuMjGNz7Be1hiPskEtnt7Fg5+GRHeahmGnf2d MAxFq4uQpk+cDIUA7JaNVVyNSdyAde1BwM9LCxs2ehUCJ1IUQFP6mtDHw8BqYAj22zHE xIjPMgZ+j7zphkEwXnN+M9DdeoZ3mXVe6NTQXZhs3e20EYAeVxyLrZPK6lvTsDcBwz1X M72M1gtjF/34Pwfyn2VfLOqUBCLlFKJhfVBBEHMnGPXPJwxD41/Z2Kj1HE9+/XP89dVi gbV4EUQoodTiCgJKNcNROVLroA9nqhgsMSpB+sKGxeawXSKAYl1bOaZISyBJmXz5r5gU dnkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=f5iG+de+Y2N7KTl2YkSdchniBmkQu5qz58wpWqM2ez8=; b=BmZddxNi3o/Cn7S5hOSGAwXIvxIyNEKkRUUCgXjfdJUjkGxtG1P0tXCBg8dF+6cwti Bgna6oiBD6ynsqrLrohCaxB3B6BORlY16JUaWjlJfJDD3GkXv1vRfEivhsRgHiKM7423 ZYkewRpp26nrUaBf7ovf9immP+5NkqG1ShnjKT6Jx8RYch+whGA9B9Ia0oQNYTXMivbj LKf4Y/aXiDkbOko5GY7SCozgCv6JSErGM+0HWjTqhDmGXeFkCDETvsbDYkOYCMWT1QPV wpOG6ydOchu8BDLvDCtYCiOg5TmFR/vkiy9QVPKtYtGz11Kb6Vn+ZeEYLRRsBKrdj/TL nNNA== X-Gm-Message-State: AJaThX4e8Mv90eCon1tRTjCivI1DrTxc6NLJHN28sv1EBPCyDplRtp38 WYm3E1FfbpdJVHGLRuoBLo1ZpA== X-Google-Smtp-Source: AGs4zMbDFN6Loux73Xfvxa8H5m2v8BUSBmlXQZIkDxWS71OrA7Z2vVnYtPYzk9+7pbfOIKQRzLQfhg== X-Received: by 10.223.190.134 with SMTP id i6mr30251176wrh.177.1512863038030; Sat, 09 Dec 2017 15:43:58 -0800 (PST) Received: from ?IPv6:2003:ea:8bc0:e400:7c68:4b91:65b0:560? (p200300EA8BC0E4007C684B9165B00560.dip0.t-ipconnect.de. [2003:ea:8bc0:e400:7c68:4b91:65b0:560]) by smtp.googlemail.com with ESMTPSA id k5sm5307315wmg.21.2017.12.09.15.43.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 09 Dec 2017 15:43:57 -0800 (PST) From: Heiner Kallweit Subject: [PATCH 1/3] PCI: introduce a device-managed version of pci_set_mwi To: Realtek linux nic maintainers , Bjorn Helgaas Cc: "netdev@vger.kernel.org" , "linux-pci@vger.kernel.org" References: <9eee5aba-a739-a609-fd65-76666f377ed1@gmail.com> Message-ID: <3e560e2b-7f11-74e2-6db5-60c8479dc59b@gmail.com> Date: Sun, 10 Dec 2017 00:43:48 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <9eee5aba-a739-a609-fd65-76666f377ed1@gmail.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Introduce a device-managed version of pci_set_mwi. First user is the Realtek r8169 driver. Signed-off-by: Heiner Kallweit Acked-by: Bjorn Helgaas --- drivers/pci/pci.c | 29 +++++++++++++++++++++++++++++ include/linux/pci.h | 1 + 2 files changed, 30 insertions(+) diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 4a7c6864f..fc57c378d 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -1458,6 +1458,7 @@ struct pci_devres { unsigned int pinned:1; unsigned int orig_intx:1; unsigned int restore_intx:1; + unsigned int mwi:1; u32 region_mask; }; @@ -1476,6 +1477,9 @@ static void pcim_release(struct device *gendev, void *res) if (this->region_mask & (1 << i)) pci_release_region(dev, i); + if (this->mwi) + pci_clear_mwi(dev); + if (this->restore_intx) pci_intx(dev, this->orig_intx); @@ -3760,6 +3764,31 @@ int pci_set_mwi(struct pci_dev *dev) } EXPORT_SYMBOL(pci_set_mwi); +/** + * pcim_set_mwi - Managed pci_set_mwi() + * @dev: the PCI device for which MWI is enabled + * + * Managed pci_set_mwi(). + * + * RETURNS: An appropriate -ERRNO error value on error, or zero for success. + */ +int pcim_set_mwi(struct pci_dev *dev) +{ + struct pci_devres *dr; + int ret; + + ret = pci_set_mwi(dev); + if (ret) + return ret; + + dr = find_pci_dr(dev); + if (dr) + dr->mwi = 1; + + return 0; +} +EXPORT_SYMBOL(pcim_set_mwi); + /** * pci_try_set_mwi - enables memory-write-invalidate PCI transaction * @dev: the PCI device for which MWI is enabled diff --git a/include/linux/pci.h b/include/linux/pci.h index 978aad784..0a7ac863a 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1064,6 +1064,7 @@ int pci_set_pcie_reset_state(struct pci_dev *dev, enum pcie_reset_state state); int pci_set_cacheline_size(struct pci_dev *dev); #define HAVE_PCI_SET_MWI int __must_check pci_set_mwi(struct pci_dev *dev); +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_intx(struct pci_dev *dev, int enable); From patchwork Sat Dec 9 23:43:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 846638 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hw4yrSGB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yvQmL20xWz9sQm for ; Sun, 10 Dec 2017 10:44:18 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751343AbdLIXoF (ORCPT ); Sat, 9 Dec 2017 18:44:05 -0500 Received: from mail-wr0-f196.google.com ([209.85.128.196]:35894 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751251AbdLIXoA (ORCPT ); Sat, 9 Dec 2017 18:44:00 -0500 Received: by mail-wr0-f196.google.com with SMTP id v105so14055490wrc.3; Sat, 09 Dec 2017 15:44:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=3OCFcWrNlp1jhZPnVj5vEwctygqM5pIVwsz5VrD8sBo=; b=hw4yrSGBQRzX2SwVvAupd470k46hrnzGLWVCSnvN/qj7D7YwaI2TyZZgfmGI3qY7UH gmlTAnQCZJ7tHz92Qa+kf3oC+BJwZrB60GxdfKZ8UC9fnzRpqHmSL5LdXNKV9FvNPp50 VnwTyrfGasZmM+m8SVXLjQqtw5rOBamw4q+Azaprw/PHCVkZLILwf7VM6SRp2r3Ga+VV 7uaB3x49PbKSrOY0sHRWvysAAGNFzlYX7GJCcYfXR1w4gnpTC+uV6/ErPDtANWOlsP4J RE+K+Y+5QNAvQJtxacO79owm21ZWPOqRCpWM1g+2twqNW6oansYioH2XovtAkaLjkUWw /wFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=3OCFcWrNlp1jhZPnVj5vEwctygqM5pIVwsz5VrD8sBo=; b=Ifo7LnEiqDSWUgwoTnDzs2yctYqZqCt5nxeLpO+Siy+ocOPJV8ZeU1RZr3AMo1FiS5 LgaEmIfgHMjLY+VA49EkH/jLPYTTb6moK/9OGpxNJC75u+CPj8hn8kPw5SdkbX75IGVG k/pg1EUUG6IZbzVnBfDRf/e5x2tneH2TAQySKOm5koIDNiu2+oYg6ODRdsYkICQtrcjk qbom+OH6ceWRX5Ut5EF1ou72uJAXenV5t7i+Wg7K7fOWrihybVVOV7irY/qEPMZEpFpz a7/2KQWhnqyDREwLqR3Q7OHX8MVD0yrNjxU3TXKImqHsP2XN8nPwBvYc624TbDt6/03h lJww== X-Gm-Message-State: AJaThX4JpjhOvFCRgtic2/MjfngqmcevKgY++9XhOKywLyXScTLTRZ3K 8Hbo7pk+QryyAxo30X+hq16tMw== X-Google-Smtp-Source: AGs4zMYfrFbr6HD7gxxZI4B73qbC7fcd6YimxRJ23A3ryahJs390FbR9mwHvnsQHqBWtGO/9PEi7rA== X-Received: by 10.223.184.122 with SMTP id u55mr32743534wrf.61.1512863039276; Sat, 09 Dec 2017 15:43:59 -0800 (PST) Received: from ?IPv6:2003:ea:8bc0:e400:7c68:4b91:65b0:560? (p200300EA8BC0E4007C684B9165B00560.dip0.t-ipconnect.de. [2003:ea:8bc0:e400:7c68:4b91:65b0:560]) by smtp.googlemail.com with ESMTPSA id r3sm5441898wmg.31.2017.12.09.15.43.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 09 Dec 2017 15:43:58 -0800 (PST) From: Heiner Kallweit Subject: [PATCH 2/3] r8169: switch to device-managed functions in probe To: Realtek linux nic maintainers , Bjorn Helgaas Cc: "netdev@vger.kernel.org" , "linux-pci@vger.kernel.org" References: <9eee5aba-a739-a609-fd65-76666f377ed1@gmail.com> Message-ID: <80a201d7-ff1d-c823-c055-05250a018c48@gmail.com> Date: Sun, 10 Dec 2017 00:43:51 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <9eee5aba-a739-a609-fd65-76666f377ed1@gmail.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Simplify probe error path and remove callback by using device-managed functions. rtl_disable_msi isn't needed any longer because the release callback of pcim_enable_device does this implicitely. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 80 +++++++++--------------------------- 1 file changed, 20 insertions(+), 60 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index fc0d5fa65..3c7d90d3a 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -4643,16 +4643,6 @@ static void rtl8169_phy_timer(struct timer_list *t) rtl_schedule_task(tp, RTL_FLAG_TASK_PHY_PENDING); } -static void rtl8169_release_board(struct pci_dev *pdev, struct net_device *dev, - void __iomem *ioaddr) -{ - iounmap(ioaddr); - pci_release_regions(pdev); - pci_clear_mwi(pdev); - pci_disable_device(pdev); - free_netdev(dev); -} - DECLARE_RTL_COND(rtl_phy_reset_cond) { return tp->phy_reset_pending(tp); @@ -4784,14 +4774,6 @@ static int rtl_tbi_ioctl(struct rtl8169_private *tp, struct mii_ioctl_data *data return -EOPNOTSUPP; } -static void rtl_disable_msi(struct pci_dev *pdev, struct rtl8169_private *tp) -{ - if (tp->features & RTL_FEATURE_MSI) { - pci_disable_msi(pdev); - tp->features &= ~RTL_FEATURE_MSI; - } -} - static void rtl_init_mdio_ops(struct rtl8169_private *tp) { struct mdio_ops *ops = &tp->mdio_ops; @@ -8256,9 +8238,6 @@ static void rtl_remove_one(struct pci_dev *pdev) unregister_netdev(dev); - dma_free_coherent(&tp->pci_dev->dev, sizeof(*tp->counters), - tp->counters, tp->counters_phys_addr); - rtl_release_firmware(tp); if (pci_dev_run_wake(pdev)) @@ -8266,9 +8245,6 @@ static void rtl_remove_one(struct pci_dev *pdev) /* restore original MAC address */ rtl_rar_set(tp, dev->perm_addr); - - rtl_disable_msi(pdev, tp); - rtl8169_release_board(pdev, dev, tp->mmio_addr); } static const struct net_device_ops rtl_netdev_ops = { @@ -8445,11 +8421,9 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) MODULENAME, RTL8169_VERSION); } - dev = alloc_etherdev(sizeof (*tp)); - if (!dev) { - rc = -ENOMEM; - goto out; - } + dev = devm_alloc_etherdev(&pdev->dev, sizeof (*tp)); + if (!dev) + return -ENOMEM; SET_NETDEV_DEV(dev, &pdev->dev); dev->netdev_ops = &rtl_netdev_ops; @@ -8472,13 +8446,13 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) PCIE_LINK_STATE_CLKPM); /* enable device (incl. PCI PM wakeup and hotplug setup) */ - rc = pci_enable_device(pdev); + rc = pcim_enable_device(pdev); if (rc < 0) { netif_err(tp, probe, dev, "enable failure\n"); - goto err_out_free_dev_1; + return rc; } - if (pci_set_mwi(pdev) < 0) + if (pcim_set_mwi(pdev) < 0) netif_info(tp, probe, dev, "Mem-Wr-Inval unavailable\n"); /* make sure PCI base addr 1 is MMIO */ @@ -8486,30 +8460,28 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) netif_err(tp, probe, dev, "region #%d not an MMIO resource, aborting\n", region); - rc = -ENODEV; - goto err_out_mwi_2; + return -ENODEV; } /* check for weird/broken PCI region reporting */ if (pci_resource_len(pdev, region) < R8169_REGS_SIZE) { netif_err(tp, probe, dev, "Invalid PCI region size(s), aborting\n"); - rc = -ENODEV; - goto err_out_mwi_2; + return -ENODEV; } rc = pci_request_regions(pdev, MODULENAME); if (rc < 0) { netif_err(tp, probe, dev, "could not request regions\n"); - goto err_out_mwi_2; + return rc; } /* ioremap MMIO region */ - ioaddr = ioremap(pci_resource_start(pdev, region), R8169_REGS_SIZE); + ioaddr = devm_ioremap(&pdev->dev, pci_resource_start(pdev, region), + R8169_REGS_SIZE); if (!ioaddr) { netif_err(tp, probe, dev, "cannot remap MMIO, aborting\n"); - rc = -EIO; - goto err_out_free_res_3; + return -EIO; } tp->mmio_addr = ioaddr; @@ -8535,7 +8507,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); if (rc < 0) { netif_err(tp, probe, dev, "DMA configuration failed\n"); - goto err_out_unmap_4; + return rc; } } @@ -8697,8 +8669,9 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) tp->rtl_fw = RTL_FIRMWARE_UNKNOWN; - tp->counters = dma_alloc_coherent (&pdev->dev, sizeof(*tp->counters), - &tp->counters_phys_addr, GFP_KERNEL); + tp->counters = dmam_alloc_coherent (&pdev->dev, sizeof(*tp->counters), + &tp->counters_phys_addr, + GFP_KERNEL); if (!tp->counters) { rc = -ENOMEM; goto err_out_msi_5; @@ -8706,7 +8679,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) rc = register_netdev(dev); if (rc < 0) - goto err_out_cnt_6; + goto err_out_msi_5; pci_set_drvdata(pdev, dev); @@ -8735,25 +8708,12 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) netif_carrier_off(dev); -out: - return rc; + return 0; -err_out_cnt_6: - dma_free_coherent(&pdev->dev, sizeof(*tp->counters), tp->counters, - tp->counters_phys_addr); err_out_msi_5: netif_napi_del(&tp->napi); - rtl_disable_msi(pdev, tp); -err_out_unmap_4: - iounmap(ioaddr); -err_out_free_res_3: - pci_release_regions(pdev); -err_out_mwi_2: - pci_clear_mwi(pdev); - pci_disable_device(pdev); -err_out_free_dev_1: - free_netdev(dev); - goto out; + + return rc; } static struct pci_driver rtl8169_pci_driver = { From patchwork Sat Dec 9 23:43:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 846634 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-pci-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lkGg1gzy"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yvQmB0yJCz9t2f for ; Sun, 10 Dec 2017 10:44:10 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751251AbdLIXoH (ORCPT ); Sat, 9 Dec 2017 18:44:07 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:44005 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751301AbdLIXoC (ORCPT ); Sat, 9 Dec 2017 18:44:02 -0500 Received: by mail-wm0-f65.google.com with SMTP id n138so8548174wmg.2; Sat, 09 Dec 2017 15:44:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=z/e8BCXO3tyrxds5UB/niXWAzL54aZv49nfkGuEBCFw=; b=lkGg1gzykGqhuSkDAqq1IcFpDe0KHIxXXdFQtIrN4hy2iJscmcIo/8O8jQJemdXJkN Oc0AMbeQ9DfVQEM5Ga1s92iYSYfVUDAojgJZ+v2PcbndmEoCfsY2AdFBTZFDvZ5ktG69 l/crvBSjnzqGTX3I5sslWACdzuzEi+YCLhFrgyPQ0/lYgaz87XH3C+41IZ2htFz47DqI faNxc+jTesRakiD9kG+g5BPoE6UcKPmCThRIT3MVVBZb206Hp8CcLUH90Vnfe/whoIJ4 R4M33CfToe7JtR1BzcdU0oVTh87pQfcwGWD9MQ0fRrnAS4fpf1SgFMfMis0IOxlGE3jE 4mvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=z/e8BCXO3tyrxds5UB/niXWAzL54aZv49nfkGuEBCFw=; b=SQZyY6++tQ1FF8dr6duLloOSIXEDE7lbPjqddLchUQ3VDs39Z+1kBlVhMEwi075Rye kkvYgcuoFm9loUMtRUsYUyPnKncg9XISgBu/rn1DTFH9p0EEpMvQxcx1z2bJBANjV6vJ pWGvJWkfrXkDRcu3b+O0e0KQ9rbP6Dh5HkHsfJISPooIUON202UmQhLEIMKMZvwEE2Dq uHzphuky/804E3ag5+2nVsOe2d/3nEeveBmaMFP9MK2D5Ht+d+10JRV70Yiqffv7iS4x NLXu2LP9lmiNI5gOJn1uYbOtFIyrN7cYsMFczpOFoE8YeuZcJhiSHaGhQC/jE7YNYDQE Xd0Q== X-Gm-Message-State: AKGB3mLzJPzXgmZTdZJydlUueJ6FcGTvG9/YrKofukTeeQJomRiaHL/o I8IaFKQg2P4AetfUezOKkbZopA== X-Google-Smtp-Source: AGs4zMZ9cCcY1E3nAZavI+FbSihdKrZA5phkoyVI9NXpHX6W21jmTbNYhazhh+t/nprnHYaWHVd9Yw== X-Received: by 10.28.88.137 with SMTP id m131mr7164136wmb.48.1512863040587; Sat, 09 Dec 2017 15:44:00 -0800 (PST) Received: from ?IPv6:2003:ea:8bc0:e400:7c68:4b91:65b0:560? (p200300EA8BC0E4007C684B9165B00560.dip0.t-ipconnect.de. [2003:ea:8bc0:e400:7c68:4b91:65b0:560]) by smtp.googlemail.com with ESMTPSA id a22sm5006398wme.46.2017.12.09.15.43.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 09 Dec 2017 15:44:00 -0800 (PST) From: Heiner Kallweit Subject: [PATCH 3/3] r8169: remove netif_napi_del in probe error path To: Realtek linux nic maintainers , Bjorn Helgaas Cc: "netdev@vger.kernel.org" , "linux-pci@vger.kernel.org" References: <9eee5aba-a739-a609-fd65-76666f377ed1@gmail.com> Message-ID: <9b78225d-f1dd-a078-aaa8-cddf2998855b@gmail.com> Date: Sun, 10 Dec 2017 00:43:53 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <9eee5aba-a739-a609-fd65-76666f377ed1@gmail.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org netif_napi_del is called implicitely by free_netdev, therefore we don't have to do it explicitely. When the probe error path is reached, the net_device isn't registered yet. Therefore reordering the call to netif_napi_del shouldn't cause any issues. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 3c7d90d3a..857f67beb 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -8672,14 +8672,12 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) tp->counters = dmam_alloc_coherent (&pdev->dev, sizeof(*tp->counters), &tp->counters_phys_addr, GFP_KERNEL); - if (!tp->counters) { - rc = -ENOMEM; - goto err_out_msi_5; - } + if (!tp->counters) + return -ENOMEM; rc = register_netdev(dev); if (rc < 0) - goto err_out_msi_5; + return rc; pci_set_drvdata(pdev, dev); @@ -8709,11 +8707,6 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) netif_carrier_off(dev); return 0; - -err_out_msi_5: - netif_napi_del(&tp->napi); - - return rc; } static struct pci_driver rtl8169_pci_driver = {