From patchwork Tue Dec 12 06:41:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 847372 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="g3Kd7X59"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ywqwg2HRHz9s1h for ; Tue, 12 Dec 2017 17:41:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752340AbdLLGlT (ORCPT ); Tue, 12 Dec 2017 01:41:19 -0500 Received: from mail-wr0-f193.google.com ([209.85.128.193]:38179 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751799AbdLLGlN (ORCPT ); Tue, 12 Dec 2017 01:41:13 -0500 Received: by mail-wr0-f193.google.com with SMTP id o2so19924095wro.5; Mon, 11 Dec 2017 22:41:13 -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=GH1NfmSX4mF93nmL4eRFOjKIibHY9dMBUI7UI8IQN5c=; b=g3Kd7X59bcGtJEDabQXCr1+5srEB2WyJlhXzAWaNBJ1nmsz5MDY7txcY+mpqt+o3KZ buQNo3KDi1F8klYpCk8fxqzD8MyN5tpql/orHnM2OFb26v10vKI8R9nL/dPZPZxyn0Vy tENXZudoKO3AYw3MFp/LPf2gNVc1Tm731eD8PPACmV4np50uoKIUCb/1s6MwPzHifT0T mJaL/mpTzevwh0IldNTvxoL0gz7mPeoTR8gUbycfR/tVn8F4eubKbUXxbEy09VzPfICg +5uFO9cRvU1qcA0PDu3meKTt6hFZdtNq5x2Veyq6L5XDDdUkYS9eMJtyJYqXcki151/t TptQ== 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=GH1NfmSX4mF93nmL4eRFOjKIibHY9dMBUI7UI8IQN5c=; b=XoqU1iUXvaJpMdStDShwu95cXfioPmKTIn/5F1OV/EA82kELIx0rcsEnNcHvSI1DXa Kv1xFRiM9OLENU1RqH6RTXlfh5fFGS+0rUANHQ3RhcMcqO1c/g5zT4KbLlLKmlviwu3E R7D/xWf2H8oWLcxrS743ZzBeqqHe1zXNzpsTwZdJCFu9Ew43PGFBtHA8D4DoQdWDvQ1f xLhb5HzLrG3GJR3DanbGGDrUXAGNomN5ddTIRFu2XyfR+IC+ZMkt6qPfeugdo5pkWJgT lY93OPSax+SdMi+qkp3i7XSit6lfsZs7ST6ESo1dZHERTd2Ns05E/H73wFOJ1uncgXIR DDPQ== X-Gm-Message-State: AKGB3mKe0E/wvEHaYtzB69wY+WM53a3/+3TqsWaEn1oAVhC3slWqWBAj 5ILwyLYpCWYX0Tui/eR3LcW8oA== X-Google-Smtp-Source: ACJfBos1Utl4w3FQaiMg9rVc9wfsnU2pkQg3dhQMsU9ewi1wI7BlTDCav/ktMcSCgQL/KIocNTFyCQ== X-Received: by 10.223.164.84 with SMTP id e20mr2621686wra.52.1513060872148; Mon, 11 Dec 2017 22:41:12 -0800 (PST) Received: from ?IPv6:2003:ea:8bc0:e400:986e:3ed1:f25:ce7? (p200300EA8BC0E400986E3ED10F250CE7.dip0.t-ipconnect.de. [2003:ea:8bc0:e400:986e:3ed1:f25:ce7]) by smtp.googlemail.com with ESMTPSA id x52sm20609975wrb.25.2017.12.11.22.41.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Dec 2017 22:41:11 -0800 (PST) From: Heiner Kallweit Subject: [PATCH v2 2/3] r8169: switch to device-managed functions in probe To: Realtek linux nic maintainers , Bjorn Helgaas , David Miller Cc: "netdev@vger.kernel.org" , "linux-pci@vger.kernel.org" References: <36fa928b-e974-c023-de3e-c2bd05f53df2@gmail.com> Message-ID: <59cef452-8991-2ddf-896c-a250622584f5@gmail.com> Date: Tue, 12 Dec 2017 07:41:02 +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: <36fa928b-e974-c023-de3e-c2bd05f53df2@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 --- v2: - no changes --- 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 = {