From patchwork Mon Jul 23 18:15:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 947932 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=cogentembedded.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=cogentembedded-com.20150623.gappssmtp.com header.i=@cogentembedded-com.20150623.gappssmtp.com header.b="whCeSL2G"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41Z8n4384mz9s2g for ; Tue, 24 Jul 2018 04:15:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388271AbeGWTSQ (ORCPT ); Mon, 23 Jul 2018 15:18:16 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:46305 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387873AbeGWTSQ (ORCPT ); Mon, 23 Jul 2018 15:18:16 -0400 Received: by mail-lj1-f194.google.com with SMTP id 203-v6so1322046ljj.13 for ; Mon, 23 Jul 2018 11:15:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=subject:from:to:cc:references:organization:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=A7/by9D57iv+IDd6hfD30wyQr9uWOQORPG9j8HUs/hU=; b=whCeSL2GbI7qLu3tbZ9TyFqRymihrta5ODi+UZI4/wn5NumnbyQFIYcW1vS5MhUtUy v2h80cXMVw++r5ffwGs8p2TtgB/SD2WC/tYpsAQZ+i9AggS2mNN2jFbemrKyAnz1sUHV FKaJG3WFmEEjk8VGC+dLFhXjoqOMxjnl2JBf3eS9rY7130FgE92Wxc/N/XmrJvpSxVV+ DPXt8PKUl2eeSHQwroZTy2EmxJPE0LYC7knJGnJbFMrKRZyz27AVJ/aUwuDLv31VlP2X l2BfWGnTkIDCx9KRBN4jE+7x9YpYQXXi2V2eYxl/uqyjhSFlPsbSkPHHqCTQiAz4zxg8 SLlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=A7/by9D57iv+IDd6hfD30wyQr9uWOQORPG9j8HUs/hU=; b=BnnsemP4xHInIQbyGyd8Grgn0c5lLf8k2QWmlt6HS9o1fn0K7kUWSvJATxQp+pi6mv xuMnbikoeQmLw/GHbKTJMP7g3Nb1qptJSjMyGqpk5DqgHB2TYuYJ4nWH+5HH96nHGHLw y6PqrqZyP3SYkLCoymQZjUqJaaN9LJUNJPW6LYHNKMaNEYOCrRlX9P1L3fzsdAjjg53r iU8vZ1L76AAPRJRyUcUcOpRlItdhbj866y2KGmmZsm34irtu52CQMQ0ka19kSILAl+WI tRKC0GfFa1vbEhVBGf7+bLjxBRb9z9TFcbcs7/5BFfP6h5UK3frSbX33eh3x2nE149p1 Fz9w== X-Gm-Message-State: AOUpUlFVfZ5eQcDTDbwnifxqd8OHy7Yq8AepFPZ9pwA8MiJ1+ejoGxks 9d3ErkNG9I0qbYBGhfg2vzb5dw== X-Google-Smtp-Source: AAOMgpclh1RvWSzlp5jThvxYyDGigPkAr0thevEl9/6oK0a/DLD7br5Gorw0mT6FHcgdYyTdkcQjJg== X-Received: by 2002:a2e:96d8:: with SMTP id d24-v6mr10544674ljj.50.1532369748930; Mon, 23 Jul 2018 11:15:48 -0700 (PDT) Received: from wasted.cogentembedded.com ([31.173.85.93]) by smtp.gmail.com with ESMTPSA id 20-v6sm1915592ljs.32.2018.07.23.11.15.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jul 2018 11:15:48 -0700 (PDT) Subject: [PATCH 5/5] sh_eth: make sh_eth_tsu_{read|write}_entry() prototypes symmetric From: Sergei Shtylyov To: netdev@vger.kernel.org, "David S. Miller" Cc: linux-renesas-soc@vger.kernel.org References: <24093fd0-1b9b-a211-f988-0272483185d6@cogentembedded.com> Organization: Cogent Embedded Message-ID: <93618d2e-86b6-e467-b577-632a25cb2c4c@cogentembedded.com> Date: Mon, 23 Jul 2018 21:15:47 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <24093fd0-1b9b-a211-f988-0272483185d6@cogentembedded.com> Content-Language: en-MW Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org sh_eth_tsu_read_entry() is still asymmetric with sh_eth_tsu_write_entry() WRT their prototypes -- make them symmetric by passing to the former a TSU register offset instead of its address and also adding the (now necessary) 'ndev' parameter... Signed-off-by: Sergei Shtylyov Reviewed-by: Geert Uytterhoeven --- drivers/net/ethernet/renesas/sh_eth.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) Index: net-next/drivers/net/ethernet/renesas/sh_eth.c =================================================================== --- net-next.orig/drivers/net/ethernet/renesas/sh_eth.c +++ net-next/drivers/net/ethernet/renesas/sh_eth.c @@ -2695,16 +2695,17 @@ static int sh_eth_tsu_write_entry(struct return 0; } -static void sh_eth_tsu_read_entry(void *reg, u8 *addr) +static void sh_eth_tsu_read_entry(struct net_device *ndev, u16 offset, u8 *addr) { + struct sh_eth_private *mdp = netdev_priv(ndev); u32 val; - val = ioread32(reg); + val = ioread32(mdp->tsu_addr + offset); addr[0] = (val >> 24) & 0xff; addr[1] = (val >> 16) & 0xff; addr[2] = (val >> 8) & 0xff; addr[3] = val & 0xff; - val = ioread32(reg + 4); + val = ioread32(mdp->tsu_addr + offset + 4); addr[4] = (val >> 8) & 0xff; addr[5] = val & 0xff; } @@ -2718,7 +2719,7 @@ static int sh_eth_tsu_find_entry(struct u8 c_addr[ETH_ALEN]; for (i = 0; i < SH_ETH_TSU_CAM_ENTRIES; i++, reg_offset += 8) { - sh_eth_tsu_read_entry(mdp->tsu_addr + reg_offset, c_addr); + sh_eth_tsu_read_entry(ndev, reg_offset, c_addr); if (ether_addr_equal(addr, c_addr)) return i; } @@ -2839,7 +2840,7 @@ static void sh_eth_tsu_purge_mcast(struc return; for (i = 0; i < SH_ETH_TSU_CAM_ENTRIES; i++, reg_offset += 8) { - sh_eth_tsu_read_entry(mdp->tsu_addr + reg_offset, addr); + sh_eth_tsu_read_entry(ndev, reg_offset, addr); if (is_multicast_ether_addr(addr)) sh_eth_tsu_del_entry(ndev, addr); }