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 = {