From patchwork Sat Dec 10 12:23:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 87567 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp777384qgi; Sat, 10 Dec 2016 04:24:08 -0800 (PST) X-Received: by 10.98.160.140 with SMTP id p12mr87701473pfl.122.1481372647917; Sat, 10 Dec 2016 04:24:07 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d30si37474606plj.183.2016.12.10.04.24.07; Sat, 10 Dec 2016 04:24:07 -0800 (PST) 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; 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 dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753285AbcLJMYC (ORCPT + 25 others); Sat, 10 Dec 2016 07:24:02 -0500 Received: from mail-lf0-f46.google.com ([209.85.215.46]:33437 "EHLO mail-lf0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752840AbcLJMX5 (ORCPT ); Sat, 10 Dec 2016 07:23:57 -0500 Received: by mail-lf0-f46.google.com with SMTP id c13so17023909lfg.0 for ; Sat, 10 Dec 2016 04:23:56 -0800 (PST) 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=o2iEDQc3pEXCmDYUxUssickRTJdY4OwzwKy8xvCuz+c=; b=PiPDAwt7gWbKrlmy0X9GJozmaNekv6t5bi8anD76CIXyVMJKnZkVKLOAHcgKS5EmB0 tRFvmaVI9HlGfDVknpche9F3BkMCXHQjPx63X31qoh9NMfAJzxYV6R0tYu8JUZEPnKEB XF5MtiCt6jw1SJKFE6WUlbGCPSZ1hpDim9Gzg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=o2iEDQc3pEXCmDYUxUssickRTJdY4OwzwKy8xvCuz+c=; b=JFS3fVvPQi5ng52dL9jbgVc51WxvD2lV0ogZged8HQlcqouJW7n7jHyaGLEUp8EJdf desnbXz9mAN5rWbWE4zRkAKQjTWQx3BBAjRVLAFigss3Kq9zyMwOxB6XTg1ucJ6/+vD0 MWA78N3vz/tbrMHNQKtTvys3KCRjBOHx7CAWVToMoL84LkfWZ8KLUAgTQXxVrAc5nR1d 4yJPjcsg/4jiUgLkV6XbREwjOkOPZiBZ1I2iqyDAHNVHG7545wBQNpZBfSl6NMXeXMie OH5ijRgEDBe/nUtyAaTsdlmqmc2Y7lnmBlP0qft5lLIIqNriv03lY/60YuhkjBpCl1HY Km4g== X-Gm-Message-State: AKaTC00JJ+CKk1ySkyPJsIfc13gIEQ/LDwqRxO8rV9AdpFmmAFfL/dnMOZuX72g42UhfXa+o X-Received: by 10.46.74.26 with SMTP id x26mr30585998lja.51.1481372635471; Sat, 10 Dec 2016 04:23:55 -0800 (PST) Received: from localhost.localdomain (183-224-132-95.pool.ukrtel.net. [95.132.224.183]) by smtp.gmail.com with ESMTPSA id f14sm2507060lff.40.2016.12.10.04.23.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 10 Dec 2016 04:23:55 -0800 (PST) From: Ivan Khoronzhuk To: mugunthanvnm@ti.com, grygorii.strashko@ti.com Cc: linux-omap@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Ivan Khoronzhuk Subject: [PATCH 1/5] net: ethernet: ti: cpsw: use same macros to get active slave Date: Sat, 10 Dec 2016 14:23:46 +0200 Message-Id: <1481372630-14914-2-git-send-email-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1481372630-14914-1-git-send-email-ivan.khoronzhuk@linaro.org> References: <1481372630-14914-1-git-send-email-ivan.khoronzhuk@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use the same, more convenient macros, to get active slave. Signed-off-by: Ivan Khoronzhuk --- drivers/net/ethernet/ti/cpsw.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) -- 2.7.4 diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index b62d958..c45f7d2 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -1624,10 +1624,7 @@ static void cpsw_hwtstamp_v2(struct cpsw_priv *priv) struct cpsw_common *cpsw = priv->cpsw; u32 ctrl, mtype; - if (cpsw->data.dual_emac) - slave = &cpsw->slaves[priv->emac_port]; - else - slave = &cpsw->slaves[cpsw->data.active_slave]; + slave = &cpsw->slaves[cpsw_slave_index(cpsw, priv)]; ctrl = slave_read(slave, CPSW2_CONTROL); switch (cpsw->version) {