From patchwork Tue Apr 23 13:08:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grygorii Strashko X-Patchwork-Id: 162677 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp3769876jan; Tue, 23 Apr 2019 06:09:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqxwQlG49EzTCK6Lm49AIC2ih/KYygzc2hYWcMta/M2lPbqDDrpK7h5Bchp+aIIzbQj6nzO1 X-Received: by 2002:a62:1815:: with SMTP id 21mr26707192pfy.107.1556024972725; Tue, 23 Apr 2019 06:09:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556024972; cv=none; d=google.com; s=arc-20160816; b=V4tsO7TYRbiqEoFJTB/MCo8FYrGeAZXQU734yknD+xYA3fLz/r83bRGQTpo9vvGmPo 9D85coxWmVD0ERQXTk37UxvBbzMVbq8OihfzJG69HuIxojBJfIQa9rm0I0VRawYKDghO PSpGOJXQYFK8k4WIIspEW+sulELjJpZuXEWuFkZT1RGy1JaCADU9fVLNpnQwyqmnJyMA ll2ufgRSqOmkY6bX5+QjvTUxfWtyLmEE6O+d562BZ5GOT1KSJgohFGnOngizJ7BNGmST WcBce3C6y648x1+y8j4cRSbQhY9H3xt4O1P4kzgFLHwLteCaSWC1TnWTAv6sIuv8QzIo gJ2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=C7eS500OVaMb2VSktLxrUDNDB3N2S7eX6aau3ZJA4U0=; b=kpCi7aUjZTkGNWchqCjmJB5qm4LcHvVtL4C3sMsnqPGYX7dmQYUTZeiMAvVF4oG+G+ WUu5c2WVwjXA8fsrkEIGL6je7V2ivyKbW69fgFnNAAOCuC1r7Vk6XpM2UGWwuTGnp+Pp hCbDzuYkgnUlscNg1pQb9UhZXfQx3It5Lz3nN3Bzp5isVqT7YalJyhvRirZPpr1k66ui O2W6IfHeKGhwX+ydq0/es5QunnUBGCMPX0upqQQT+X+od6CFWMbR6gM/f4LGqQhUwnyJ CiOtPQddbB86rGjkEIqVV8xgrIsRjOyrpThzmyM6JUjfG7VGPKFf4+8cMeNaypg2F0Au bLsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b="Vh/0vicG"; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m7si15786893pls.114.2019.04.23.06.09.32; Tue, 23 Apr 2019 06:09:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b="Vh/0vicG"; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727871AbfDWNJb (ORCPT + 5 others); Tue, 23 Apr 2019 09:09:31 -0400 Received: from lelv0142.ext.ti.com ([198.47.23.249]:58106 "EHLO lelv0142.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727458AbfDWNJa (ORCPT ); Tue, 23 Apr 2019 09:09:30 -0400 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id x3ND9QuY066407; Tue, 23 Apr 2019 08:09:26 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1556024966; bh=C7eS500OVaMb2VSktLxrUDNDB3N2S7eX6aau3ZJA4U0=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=Vh/0vicG+MShQ+guXN0VUf7U2bXsn99pyUP1cs1Du5BOMW4OP1agT3+nPSfnDOdNv tVzE37DanrqsicGD7f0fuSq24psF6vAbFk41e/gyixa3slV3EAubmV2RsWrYYpdtXT AlZAzvk2PcJ0giU29ABeCVPeBeZBFxx0zUeg5CA8= Received: from DFLE115.ent.ti.com (dfle115.ent.ti.com [10.64.6.36]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x3ND9QVi096635 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 23 Apr 2019 08:09:26 -0500 Received: from DFLE109.ent.ti.com (10.64.6.30) by DFLE115.ent.ti.com (10.64.6.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Tue, 23 Apr 2019 08:09:26 -0500 Received: from lelv0327.itg.ti.com (10.180.67.183) by DFLE109.ent.ti.com (10.64.6.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5 via Frontend Transport; Tue, 23 Apr 2019 08:09:25 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by lelv0327.itg.ti.com (8.15.2/8.15.2) with ESMTP id x3ND9Pxm126123; Tue, 23 Apr 2019 08:09:25 -0500 From: Grygorii Strashko To: , Ilias Apalodimas , "David S . Miller" , Ivan Khoronzhuk CC: Florian Fainelli , Andrew Lunn , Sekhar Nori , , , Murali Karicheri , Grygorii Strashko Subject: [PATCH net-next 07/19] net: ethernet: ti: cpsw: use devm_alloc_etherdev_mqs() Date: Tue, 23 Apr 2019 16:08:58 +0300 Message-ID: <1556024950-20752-8-git-send-email-grygorii.strashko@ti.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556024950-20752-1-git-send-email-grygorii.strashko@ti.com> References: <1556024950-20752-1-git-send-email-grygorii.strashko@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Use devm_alloc_etherdev_mqs() and simplify code. Signed-off-by: Grygorii Strashko --- drivers/net/ethernet/ti/cpsw.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) -- 2.17.1 Reviewed-by: Andrew Lunn diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 17dd81f25f5e..e714b8f4739c 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -3399,7 +3399,8 @@ static int cpsw_probe_dual_emac(struct cpsw_priv *priv) struct cpsw_priv *priv_sl2; int ret = 0; - ndev = alloc_etherdev_mq(sizeof(struct cpsw_priv), CPSW_MAX_QUEUES); + ndev = devm_alloc_etherdev_mqs(cpsw->dev, sizeof(struct cpsw_priv), + CPSW_MAX_QUEUES, CPSW_MAX_QUEUES); if (!ndev) { dev_err(cpsw->dev, "cpsw: error allocating net_device\n"); return -ENOMEM; @@ -3433,11 +3434,8 @@ static int cpsw_probe_dual_emac(struct cpsw_priv *priv) /* register the network device */ SET_NETDEV_DEV(ndev, cpsw->dev); ret = register_netdev(ndev); - if (ret) { + if (ret) dev_err(cpsw->dev, "cpsw: error registering net device\n"); - free_netdev(ndev); - ret = -ENODEV; - } return ret; } @@ -3481,7 +3479,8 @@ static int cpsw_probe(struct platform_device *pdev) cpsw->dev = dev; - ndev = alloc_etherdev_mq(sizeof(struct cpsw_priv), CPSW_MAX_QUEUES); + ndev = devm_alloc_etherdev_mqs(dev, sizeof(struct cpsw_priv), + CPSW_MAX_QUEUES, CPSW_MAX_QUEUES); if (!ndev) { dev_err(dev, "error allocating net_device\n"); return -ENOMEM; @@ -3499,7 +3498,7 @@ static int cpsw_probe(struct platform_device *pdev) if (IS_ERR(mode)) { ret = PTR_ERR(mode); dev_err(dev, "gpio request failed, ret %d\n", ret); - goto clean_ndev_ret; + return ret; } /* @@ -3768,8 +3767,6 @@ static int cpsw_probe(struct platform_device *pdev) pm_runtime_put_sync(&pdev->dev); clean_runtime_disable_ret: pm_runtime_disable(&pdev->dev); -clean_ndev_ret: - free_netdev(priv->ndev); return ret; } @@ -3794,9 +3791,6 @@ static int cpsw_remove(struct platform_device *pdev) cpsw_remove_dt(pdev); pm_runtime_put_sync(&pdev->dev); pm_runtime_disable(&pdev->dev); - if (cpsw->data.dual_emac) - free_netdev(cpsw->slaves[1].ndev); - free_netdev(ndev); return 0; }