From patchwork Mon Jun 25 20:37:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 934550 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="iwvYFRLk"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41F1F54Q8tz9s1B for ; Tue, 26 Jun 2018 06:37:13 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755700AbeFYUhL (ORCPT ); Mon, 25 Jun 2018 16:37:11 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:41299 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753445AbeFYUhJ (ORCPT ); Mon, 25 Jun 2018 16:37:09 -0400 Received: by mail-wr0-f193.google.com with SMTP id h10-v6so14954237wrq.8 for ; Mon, 25 Jun 2018 13:37:09 -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=Z9C84Q16P9RdXjjQMmBMvIr/7fZaThHbJoGkMFRNcTk=; b=iwvYFRLk388sXx5C5lyqaJStjUULPPyPnY/clFPr0CEQcV72GrKWsR7Qk4MqNXev2a XoeqXVlCS/v/F7Im4tIraJhEjuqucy4LCZPCqcUHdrsUOFc4f0b9ZO6nvxSZsgc4MiCx Ur0j5Q9eLxtVJ8JXWdMd4oLSBFK3S3KC7A+4d594fjeUn/bIbyFC9ATs+x4Xsv9O0J6b cowybIs1PSa287H9PMTJxjloawjDLPQC+eiQbXOAe+oY4zczKiLBBT3rgENZPvQZnZyW qJ8ne/tbl+0rFIxFMT//y8jJjjKnxj2+NHqUskyPbnXM5AxNdlTVbKDIYpChS7L/hAMT Wqkg== 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=Z9C84Q16P9RdXjjQMmBMvIr/7fZaThHbJoGkMFRNcTk=; b=RWHSHM9Pz+Qqj9dM06F+yP0kj/JMm5YWIUlJ0co+ztTG0ggHi87bqvm9Y09UGVtqx9 YbY6AcE+vOhN8mRk5MEZtmQc9rdH8aN1qAkTjRZoR4AwVzPTKCgA8hwXbOHWYvet6vcc zOMknwoDzG80ItkPSRJgpmoFdlDzLYtc4672+LgkpRyAoA+w4RTphp8ZXWAOvMnhJxHO 94TpPGLmzkrNpZazABrtRRl0nerVUEGr9+fYTJvHT7juPr4G4ag/7KyL4LmWHyIkYN8x ScLmBcJCQ+11rAZSTd+DKbpzb2306zfhw+N6CpXgCOQjAit2TTkN4A5wzEoyuZlxqpNh nUQw== X-Gm-Message-State: APt69E0zlHBOkFqj2Bg3COezaqVs6oz9BZ5ciypLftau3E4vray8vcLn 5cVXJHen1vPROOqMnpUIXhxtOw== X-Google-Smtp-Source: AAOMgpeFhYmg7sMU5yJnPNiXAzZUGfBSwUDONUoMaicBFisKFRye5+zuLsQ8ETr5TyIAkXJV4j53SQ== X-Received: by 2002:adf:a0c2:: with SMTP id n2-v6mr11546561wrn.23.1529959028685; Mon, 25 Jun 2018 13:37:08 -0700 (PDT) Received: from wasted.cogentembedded.com (bzq-219-43-106.isdn.bezeqint.net. [62.219.43.106]) by smtp.gmail.com with ESMTPSA id m65-v6sm292555wmd.1.2018.06.25.13.37.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Jun 2018 13:37:07 -0700 (PDT) Subject: [PATCH 2/2] sh_eth: remove sh_eth_cpu_data::rpadir_value From: Sergei Shtylyov To: netdev@vger.kernel.org, "David S. Miller" Cc: linux-renesas-soc@vger.kernel.org References: <2809eba8-4c9a-1d5f-a47d-8125777e365b@cogentembedded.com> Organization: Cogent Embedded Message-ID: Date: Mon, 25 Jun 2018 23:37:06 +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: <2809eba8-4c9a-1d5f-a47d-8125777e365b@cogentembedded.com> Content-Language: en-MW Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If RPADIR exists, the value written to it is always the same for all SoCs (and derived from NET_IP_ALIGN), so there has not been any need to store it in the *struct* sh_eth_cpu_data... Signed-off-by: Sergei Shtylyov Reviewed-by: Geert Uytterhoeven --- drivers/net/ethernet/renesas/sh_eth.c | 8 +------- drivers/net/ethernet/renesas/sh_eth.h | 1 - 2 files changed, 1 insertion(+), 8 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 @@ -622,7 +622,6 @@ static struct sh_eth_cpu_data r7s72100_d .tpauser = 1, .hw_swap = 1, .rpadir = 1, - .rpadir_value = 2 << 16, .no_trimd = 1, .no_ade = 1, .xdfar_rw = 1, @@ -672,7 +671,6 @@ static struct sh_eth_cpu_data r8a7740_da .bculr = 1, .hw_swap = 1, .rpadir = 1, - .rpadir_value = 2 << 16, .no_trimd = 1, .no_ade = 1, .xdfar_rw = 1, @@ -798,7 +796,6 @@ static struct sh_eth_cpu_data r8a77980_d .hw_swap = 1, .nbst = 1, .rpadir = 1, - .rpadir_value = 2 << 16, .no_trimd = 1, .no_ade = 1, .xdfar_rw = 1, @@ -851,7 +848,6 @@ static struct sh_eth_cpu_data sh7724_dat .tpauser = 1, .hw_swap = 1, .rpadir = 1, - .rpadir_value = 0x00020000, /* NET_IP_ALIGN assumed to be 2 */ }; static void sh_eth_set_rate_sh7757(struct net_device *ndev) @@ -898,7 +894,6 @@ static struct sh_eth_cpu_data sh7757_dat .hw_swap = 1, .no_ade = 1, .rpadir = 1, - .rpadir_value = 2 << 16, .rtrate = 1, .dual_port = 1, }; @@ -978,7 +973,6 @@ static struct sh_eth_cpu_data sh7757_dat .bculr = 1, .hw_swap = 1, .rpadir = 1, - .rpadir_value = 2 << 16, .no_trimd = 1, .no_ade = 1, .xdfar_rw = 1, @@ -1467,7 +1461,7 @@ static int sh_eth_dev_init(struct net_de /* Descriptor format */ sh_eth_ring_format(ndev); if (mdp->cd->rpadir) - sh_eth_write(ndev, mdp->cd->rpadir_value, RPADIR); + sh_eth_write(ndev, NET_IP_ALIGN << 16, RPADIR); /* all sh_eth int mask */ sh_eth_write(ndev, 0, EESIPR); Index: net-next/drivers/net/ethernet/renesas/sh_eth.h =================================================================== --- net-next.orig/drivers/net/ethernet/renesas/sh_eth.h +++ net-next/drivers/net/ethernet/renesas/sh_eth.h @@ -487,7 +487,6 @@ struct sh_eth_cpu_data { u32 ecsipr_value; u32 fdr_value; u32 fcftr_value; - u32 rpadir_value; /* interrupt checking mask */ u32 tx_check;