From patchwork Wed Jun 5 13:20:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 165882 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp7339621ili; Wed, 5 Jun 2019 06:20:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqz0KrDXxYr7zG0K8KHO6Bl5lnTZuCgV+mDXhCC3OtOjTgPwDTLRv16+t6GzF30ATLzH8dz+ X-Received: by 2002:a63:81c2:: with SMTP id t185mr4455745pgd.257.1559740825110; Wed, 05 Jun 2019 06:20:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559740825; cv=none; d=google.com; s=arc-20160816; b=JYCBGBrCJYsn/3pQ09oFfUXW385QJKS8FKCCzsDhU/GLwKROTM35cEW+0/SDo1LJXo K6g7g7x5K3Rfa3GTmxA24pZ5aPzn/J4NpYEThguj+Mk2BuSQX4KDI01Y0jnfwKi5jNJE uuazGgX57Hfe0eF10IPLf93T8bveMUoJKlK87GBsBeSMJMTeZ6agWOvsKE5z6qQ4ymUj S6KIKMzO2Ii/5rM7LOf+1lHxBJeuncTu2Gvc2b5mafVTnlrxad1cBgT1a8VGf5Zu48oG tZt+E5d66r7NECZGt5DkAocMAuOMRGWB6cFJONcbgAiW9D+pjRo5GYKYxikh0IqNAYZq ULUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=CE8Iq8ZjUtNENgYj+FlGTMxcTQ2fFaeeS723D5LJTaU=; b=v2rtw3+vrw6cSqZ0b1Bt0/e/ZYHEo7qXJF7Y2qbDcNmU7OJ2L5qyc045f+3G0QpoP5 0fa1hiEgv2m3FLAbPkNUO8kCjPztqzTCoKx2+iRoxRU1DmgYpzlfTRw0QtuVI1SzPHKC hzOnNIze0xJQj9fAiozHKo17DnqgFra2ygG+hdJJ08gRxoTL+LfGXpjEUwlyDTyq1+Dc UWrgKCKg4skkAUp1EDxMMMhx7CvD0fC+n9DofOVcnyYM/yVRqgJy5DJ2pjiyEpAfmXG2 S5ZsOgtEExwf79x5rk0jxRmOFWUo+1eMZpsssxDJo5xw5xFwTOy5JQykoZWS+EobmH68 6b0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Ie/iVmmm"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j17si30459504pfn.226.2019.06.05.06.20.24; Wed, 05 Jun 2019 06:20:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=@linaro.org header.s=google header.b="Ie/iVmmm"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728076AbfFENUY (ORCPT + 30 others); Wed, 5 Jun 2019 09:20:24 -0400 Received: from mail-lf1-f66.google.com ([209.85.167.66]:45368 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727642AbfFENUT (ORCPT ); Wed, 5 Jun 2019 09:20:19 -0400 Received: by mail-lf1-f66.google.com with SMTP id u10so12023423lfm.12 for ; Wed, 05 Jun 2019 06:20:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=CE8Iq8ZjUtNENgYj+FlGTMxcTQ2fFaeeS723D5LJTaU=; b=Ie/iVmmmXC6K55Uaa53Di3vSnNQfwFe1FvKFIdOAI2En/YaClJm3K8u2Hw01cBFi/b RytUn8xjSlb/3NQuDuoxQom0+Udw7r6FvZd18bSt7iyupgyOrRmKC+OMKowrKmAGRB63 uBq2urzv3cyOApD2MKU65Q1u0P8ojAkvxcHiVqF/hBHGcihIQS4HMpqgWyZSZqd0nOo5 8kESN0+fpHn6UddiWD8pg+cXV42hX8sHqS3r43SktDUC27osbBWxOGhPGHrNTC6FexB1 pTr+tpVaOvaF68MfWcPNdljRzLk3X3EQymwMI5uA6DpySSsr+jKQRPsgpStETVz2sPXM w7nQ== 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:in-reply-to :references; bh=CE8Iq8ZjUtNENgYj+FlGTMxcTQ2fFaeeS723D5LJTaU=; b=F9Kc1hvNjAkt7rE1zBe7I3bmsJK/ld1BEjrTfKO1hmWOWzk7CRCMps/kClN1AFRJfd sviSwAxHQ50yXOAROh9E2cF6pLq7T5cX6yYPNO8jngVtCKbNVuhfahPPOWQH+5qtNYqt hXsQn1rHTYTs4FXFRdvVm3WD3li6oU7mG4jH/H0lRI1e3j1lqk8d988nvlHt0TwJrcKF YEbf4NuYnEnp3o7tLbu6UY39Xxmh9jHs2VqJz2pITxI3OITebEJy7BPISSrQ1GSqUeV6 7ber9PYQ83Z8NmKqJnzDFWVg3NoTEExj/yy0852gwW5sCrqJJiGV6+CYR035iuDoYnS4 8R+A== X-Gm-Message-State: APjAAAVfwgofA6TqFHorD7/ou3B7tIlT02PTQydm7UbVKX0XtvRg/UQA HMAlCsU8yZYnuOHZudrn1Jhuow== X-Received: by 2002:a19:7110:: with SMTP id m16mr20414541lfc.4.1559740817213; Wed, 05 Jun 2019 06:20:17 -0700 (PDT) Received: from localhost.localdomain (59-201-94-178.pool.ukrtel.net. [178.94.201.59]) by smtp.gmail.com with ESMTPSA id t3sm1893259lfk.59.2019.06.05.06.20.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Jun 2019 06:20:16 -0700 (PDT) From: Ivan Khoronzhuk To: grygorii.strashko@ti.com, hawk@kernel.org, davem@davemloft.net Cc: ast@kernel.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, xdp-newbies@vger.kernel.org, ilias.apalodimas@linaro.org, netdev@vger.kernel.org, daniel@iogearbox.net, jakub.kicinski@netronome.com, john.fastabend@gmail.com, Ivan Khoronzhuk Subject: [PATCH v3 net-next 3/7] net: ethernet: ti: cpsw: use cpsw as drv data Date: Wed, 5 Jun 2019 16:20:05 +0300 Message-Id: <20190605132009.10734-4-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190605132009.10734-1-ivan.khoronzhuk@linaro.org> References: <20190605132009.10734-1-ivan.khoronzhuk@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org No need to set ndev for drvdata when mainly cpsw reference is needed, so correct this legacy decision. Reviewed-by: Grygorii Strashko Signed-off-by: Ivan Khoronzhuk --- drivers/net/ethernet/ti/cpsw.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) -- 2.17.1 diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 6d3f1f3f90cb..3430503e1053 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -2265,8 +2265,7 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data, static void cpsw_remove_dt(struct platform_device *pdev) { - struct net_device *ndev = platform_get_drvdata(pdev); - struct cpsw_common *cpsw = ndev_to_cpsw(ndev); + struct cpsw_common *cpsw = platform_get_drvdata(pdev); struct cpsw_platform_data *data = &cpsw->data; struct device_node *node = pdev->dev.of_node; struct device_node *slave_node; @@ -2477,7 +2476,7 @@ static int cpsw_probe(struct platform_device *pdev) goto clean_cpts; } - platform_set_drvdata(pdev, ndev); + platform_set_drvdata(pdev, cpsw); priv = netdev_priv(ndev); priv->cpsw = cpsw; priv->ndev = ndev; @@ -2570,9 +2569,8 @@ static int cpsw_probe(struct platform_device *pdev) static int cpsw_remove(struct platform_device *pdev) { - struct net_device *ndev = platform_get_drvdata(pdev); - struct cpsw_common *cpsw = ndev_to_cpsw(ndev); - int ret; + struct cpsw_common *cpsw = platform_get_drvdata(pdev); + int i, ret; ret = pm_runtime_get_sync(&pdev->dev); if (ret < 0) { @@ -2580,9 +2578,9 @@ static int cpsw_remove(struct platform_device *pdev) return ret; } - if (cpsw->data.dual_emac) - unregister_netdev(cpsw->slaves[1].ndev); - unregister_netdev(ndev); + for (i = 0; i < cpsw->data.slaves; i++) + if (cpsw->slaves[i].ndev) + unregister_netdev(cpsw->slaves[i].ndev); cpts_release(cpsw->cpts); cpdma_ctlr_destroy(cpsw->dma);