Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 577F0C43381 for ; Sat, 9 Mar 2019 05:21:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 16EA9207E0 for ; Sat, 9 Mar 2019 05:21:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EmwKosX0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725797AbfCIFV3 (ORCPT ); Sat, 9 Mar 2019 00:21:29 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:34177 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725613AbfCIFV3 (ORCPT ); Sat, 9 Mar 2019 00:21:29 -0500 Received: by mail-pf1-f195.google.com with SMTP id u9so15660745pfn.1 for ; Fri, 08 Mar 2019 21:21:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=LpPxhzkT03DJWRtaS0V+peqMTbhGWTmUT3mK/8BR2Ds=; b=EmwKosX0Lkbw8bq2pctsCxgrK83W8Z0mt4IGY86iCqXuWl9O+cvBei4taMNVXcQ0CY pjRupQRo0yvbFlIRdnvapKasftc4CNJ9t73+a8RL2a9AskMxRSzy++ka8WwObuwuLAeV TxIzBdx4dF3j39xHiOMiXIDSjuLsTHEZnlGj8a5+Rfq8hXN9d3uDiQEWQbxgybsTMviH cRXj1iFCZe2/z2R13yG/hs8/RierG/mG2hHPBQS383/GiZ5+Ijoof7rhXFV59dsH7djX yWGnKizR0Kgd+JmKLkAWKuxGncGPh9wJ7SvBerAUt2jq79+Ugmb927cyyMWynj1Gfhk6 Njdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=LpPxhzkT03DJWRtaS0V+peqMTbhGWTmUT3mK/8BR2Ds=; b=JVpdwyCTC3G5ZjVU0rb7F8r91lL3tHQr2dw05kHPZ8ypZPb/NhgLTHFDdoI7nFKpRo QztChRbTFbyI5lTS44vLvvH7I/LWgA0w7aNHx2rhazKYaBTkAXBtxjFqlLBwdY/vxO+m wJt2n3podwZSEbJ3K6Lly0i42/Ycg1o//iL5XEluz+Y9F7xp0WRiScs55lchPbdpSCWT MQlvRvuTzyLZpqGNHpgrFwGmHgR0ZSDYDaG6Qdslg0Xb6qEXBzsyet+OhuPVV1ppMG/p 1pJD64kWr53AtY2Rr68i7mSR9I42iAHaRmNpgpGjlRUBQKs3uGYxsVYUgCfWWNNDT5M3 2J+A== X-Gm-Message-State: APjAAAVn2HXmDLZcm8sVpYJqIyiqF8U1tA1JizzC39XeTXCTzqQF1UUS 5/gOHihDsM5jHduhmyrzzSFGQDrt X-Google-Smtp-Source: APXvYqwK4vqu8iJOPW04xaT49Z0YFWdBbe8ucJZpgyaBBBSCzP5CXt7vBYnKy7e64r2OmQykqV+29A== X-Received: by 2002:a17:902:7242:: with SMTP id c2mr22108367pll.245.1552108887947; Fri, 08 Mar 2019 21:21:27 -0800 (PST) Received: from localhost.localdomain (astound-69-42-18-19.ca.astound.net. [69.42.18.19]) by smtp.gmail.com with ESMTPSA id h13sm15102381pfn.114.2019.03.08.21.21.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2019 21:21:27 -0800 (PST) From: Rosen Penev To: netdev@vger.kernel.org Cc: igor.russkikh@aquantia.com Subject: [PATCH] net: aquantia: Switch alloc_etherdev to devm variant Date: Fri, 8 Mar 2019 21:21:26 -0800 Message-Id: <20190309052126.23761-1-rosenp@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Allows some simplification by avoiding calling free_netdev. Tested on AMD based x86 system using AQC108 chipset. Signed-off-by: Rosen Penev --- drivers/net/ethernet/aquantia/atlantic/aq_main.c | 3 ++- drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c | 11 +++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_main.c b/drivers/net/ethernet/aquantia/atlantic/aq_main.c index 2a11c1eefd8f..319c564c28b2 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_main.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_main.c @@ -30,7 +30,8 @@ struct net_device *aq_ndev_alloc(void) struct net_device *ndev = NULL; struct aq_nic_s *aq_nic = NULL; - ndev = alloc_etherdev_mq(sizeof(struct aq_nic_s), AQ_CFG_VECS_MAX); + ndev = devm_alloc_etherdev_mq(aq_nic->ndev, sizeof(struct aq_nic_s), + AQ_CFG_VECS_MAX); if (!ndev) return NULL; diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c index c8b44cdb91c1..ce3e4ca9ab68 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c @@ -224,13 +224,11 @@ static int aq_pci_probe(struct pci_dev *pdev, err = aq_pci_probe_get_hw_by_id(pdev, &self->aq_hw_ops, &aq_nic_get_cfg(self)->aq_hw_caps); if (err) - goto err_ioremap; + return err; self->aq_hw = kzalloc(sizeof(*self->aq_hw), GFP_KERNEL); - if (!self->aq_hw) { - err = -ENOMEM; - goto err_ioremap; - } + if (!self->aq_hw) + return -ENOMEM; self->aq_hw->aq_nic_cfg = aq_nic_get_cfg(self); for (bar = 0; bar < 4; ++bar) { @@ -296,8 +294,6 @@ static int aq_pci_probe(struct pci_dev *pdev, iounmap(self->aq_hw->mmio); err_free_aq_hw: kfree(self->aq_hw); -err_ioremap: - free_netdev(ndev); err_ndev: pci_release_regions(pdev); err_pci_func: @@ -318,7 +314,6 @@ static void aq_pci_remove(struct pci_dev *pdev) iounmap(self->aq_hw->mmio); kfree(self->aq_hw); pci_release_regions(pdev); - free_netdev(self->ndev); } pci_disable_device(pdev); -- 2.17.1