From patchwork Fri Apr 26 17:12:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grygorii Strashko X-Patchwork-Id: 162929 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp991864jan; Fri, 26 Apr 2019 10:13:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqzmA8H528QRlj41LoRfTDXxao4hbqBoxWZw6nhiW2f7tS/RSzU3DyJG3PGtDrZJBh1YwenY X-Received: by 2002:a63:f444:: with SMTP id p4mr44844696pgk.32.1556298784827; Fri, 26 Apr 2019 10:13:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556298784; cv=none; d=google.com; s=arc-20160816; b=omrxXSHUSizgPh/7aatSwBjb5LfHk3cqe73laclRiqVN+zPmVG00FXuYd9s4OYh46O 6GCbHcSKfBIXCprJYD/rSkTT37RYbpyvhuYkbpOD9jh/fizu27YrmByfLO3dB728ZrGF IUZwhnk4SKnkV7rYQ0NvOeJSttx/qCfa5oY54Ad0YRog1CKpyczhaWWSd4RB03IhMFE1 vqrAK/Ip8v+G8ZF1D1/+TD6+QVtIxeFJ/dAo9FxbppiWQkLuxxEFeX/U2XoevAXpIiyf qbIuuOXVUB0bMP9I3ZUMiN4vSjSsYO6JSy+q2APweJRfI2BjceMcAkDF/ovYKsBQUaIj jYMw== 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=Tj8olacDYfKcF5PnqXI2on8sVfvgWdBZkNzjcXWmEn0=; b=P93fPiRR0ff8MuSAuI+MUavOtT+2/K9I6Gek8vpV96H8Tx01yohgAa97gte81opncx 0Wbv2vR8w/sDOVIqcgzXPiuHmD3vdPr7U3bp0EcVWg1zGf411QNd2cMBwnGXDIr/YWI4 tNczNWiU+44Q2uAk5EKsyiwYPnrszs41QyhnJACFvHGAspdMC93bZ8diijDlpONjy6+K yaNt0vvzxCqjMsi6wY3GgUOBkulXZ0ySXcWVA+PdQBPTx3NXNejzuU9iaR5esPBZF5oK ZmKb4po5lLvVvaWX/BViob5N9Wsn5B4sezMTPoF9BwYqScKKoxmgt4S3SpX3djW8DGKM hNdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=dbwlt4du; 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 129si24538592pga.379.2019.04.26.10.13.04; Fri, 26 Apr 2019 10:13:04 -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=dbwlt4du; 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 S1726610AbfDZRND (ORCPT + 5 others); Fri, 26 Apr 2019 13:13:03 -0400 Received: from lelv0143.ext.ti.com ([198.47.23.248]:37422 "EHLO lelv0143.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726596AbfDZRND (ORCPT ); Fri, 26 Apr 2019 13:13:03 -0400 Received: from lelv0265.itg.ti.com ([10.180.67.224]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id x3QHCwZn105167; Fri, 26 Apr 2019 12:12:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1556298778; bh=Tj8olacDYfKcF5PnqXI2on8sVfvgWdBZkNzjcXWmEn0=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=dbwlt4du4jdx2qBZ4hOAs1r4a3RdPIF9O8ZRhM8pXtP8EE9xj/Wj36opSWUZebWO3 wh96RdMQlvxDeaZKA9VNDW348Tb2YaFe95pwsK9kYIXdsicQPTi8VIVeiE+IOCUxN6 LSvM3Tjtr+pjMiCl4OhhpxzfrD9NgRU7/LQ8cpJA= Received: from DLEE108.ent.ti.com (dlee108.ent.ti.com [157.170.170.38]) by lelv0265.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x3QHCwpr122746 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 26 Apr 2019 12:12:58 -0500 Received: from DLEE112.ent.ti.com (157.170.170.23) by DLEE108.ent.ti.com (157.170.170.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Fri, 26 Apr 2019 12:12:58 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) by DLEE112.ent.ti.com (157.170.170.23) 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; Fri, 26 Apr 2019 12:12:58 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id x3QHCvQv019320; Fri, 26 Apr 2019 12:12:58 -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 v2 07/20] net: ethernet: ti: cpsw: use devm_alloc_etherdev_mqs() Date: Fri, 26 Apr 2019 20:12:29 +0300 Message-ID: <1556298762-8632-8-git-send-email-grygorii.strashko@ti.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556298762-8632-1-git-send-email-grygorii.strashko@ti.com> References: <1556298762-8632-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. Reviewed-by: Andrew Lunn Signed-off-by: Grygorii Strashko --- drivers/net/ethernet/ti/cpsw.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) -- 2.17.1 diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index e771e4269af8..ddc259c45481 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; }