From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sergei Shtylyov Subject: Re: [PATCH 2/2] sh_eth: remove 'register_type' field from 'struct sh_eth_plat_data' Date: Tue, 20 Aug 2013 18:27:33 +0400 Message-ID: <52137CD5.1040902@cogentembedded.com> References: <201308180308.39941.sergei.shtylyov@cogentembedded.com> <201308180313.26607.sergei.shtylyov@cogentembedded.com> <3069255.T0Cvttgz9W@avalon> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, davem@davemloft.net, lethal@linux-sh.org, linux-sh@vger.kernel.org To: Laurent Pinchart Return-path: Received: from mail-la0-f50.google.com ([209.85.215.50]:41439 "EHLO mail-la0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751392Ab3HTO12 (ORCPT ); Tue, 20 Aug 2013 10:27:28 -0400 Received: by mail-la0-f50.google.com with SMTP id ek20so359064lab.23 for ; Tue, 20 Aug 2013 07:27:27 -0700 (PDT) In-Reply-To: <3069255.T0Cvttgz9W@avalon> Sender: netdev-owner@vger.kernel.org List-ID: Hello. On 20-08-2013 14:51, Laurent Pinchart wrote: >> Now that the 'register_type' field of the 'sh_eth' driver's platform data is >> not used by the driver anymore, it's time to remove it and its >> initializers from the SH platform code. Also move *enum* declaring values >> for this field from to the local driver's header file >> as they're only needed by the driver itself now... >> Signed-off-by: Sergei Shtylyov >> --- >> arch/arm/mach-shmobile/board-armadillo800eva.c | 1 - >> arch/arm/mach-shmobile/board-bockw.c | 1 - >> arch/sh/boards/board-espt.c | 1 - >> arch/sh/boards/board-sh7757lcr.c | 4 ---- >> arch/sh/boards/mach-ecovec24/setup.c | 1 - >> arch/sh/boards/mach-se/7724/setup.c | 1 - >> arch/sh/boards/mach-sh7763rdp/setup.c | 1 - >> arch/sh/kernel/cpu/sh2/setup-sh7619.c | 1 - >> drivers/net/ethernet/renesas/sh_eth.h | 7 +++++++ >> include/linux/sh_eth.h | 7 ------- >> 10 files changed, 7 insertions(+), 18 deletions(-) > [snip] >> 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 >> @@ -157,6 +157,13 @@ enum { >> SH_ETH_MAX_REGISTER_OFFSET, >> }; >> >> +enum { >> + SH_ETH_REG_GIGABIT, >> + SH_ETH_REG_FAST_RCAR, >> + SH_ETH_REG_FAST_SH4, >> + SH_ETH_REG_FAST_SH3_SH2 >> +}; >> + > Would it make sense to move this change and the one below to a separate patch > to be merged through the net tree ? I'm intending to merge these patches thru the net-next tree. >> /* Driver's parameters */ >> #if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_SHMOBILE) >> #define SH4_SKB_RX_ALIGN 32 >> Index: net-next/include/linux/sh_eth.h >> =================================================================== >> --- net-next.orig/include/linux/sh_eth.h >> +++ net-next/include/linux/sh_eth.h >> @@ -5,17 +5,10 @@ >> #include >> >> enum {EDMAC_LITTLE_ENDIAN, EDMAC_BIG_ENDIAN}; >> -enum { >> - SH_ETH_REG_GIGABIT, >> - SH_ETH_REG_FAST_RCAR, >> - SH_ETH_REG_FAST_SH4, >> - SH_ETH_REG_FAST_SH3_SH2 >> -}; >> >> struct sh_eth_plat_data { >> int phy; >> int edmac_endian; > Wouldn't it make sense to move the edmac_endian field to sh_eth_cpu_data as > well ? No, it depends on the SoC endianness which is determined by power-on pin strapping -- which is board specific. WBR, Sergei