From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sergei Shtylyov Subject: [PATCH net-next 2/2] sh_eth: kill useless check in __sh_eth_get_regs() Date: Sun, 1 Apr 2018 00:23:51 +0300 Message-ID: <47af0c2c-bba9-a346-1925-06c99142cbb2@cogentembedded.com> References: <998029b4-9400-ebc3-51c1-623c3f72b6cc@cogentembedded.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: linux-renesas-soc@vger.kernel.org, linux-sh@vger.kernel.org To: netdev@vger.kernel.org Return-path: Received: from mail-lf0-f68.google.com ([209.85.215.68]:39798 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751434AbeCaVXy (ORCPT ); Sat, 31 Mar 2018 17:23:54 -0400 Received: by mail-lf0-f68.google.com with SMTP id p142-v6so16356714lfd.6 for ; Sat, 31 Mar 2018 14:23:54 -0700 (PDT) In-Reply-To: <998029b4-9400-ebc3-51c1-623c3f72b6cc@cogentembedded.com> Content-Language: en-MW Sender: netdev-owner@vger.kernel.org List-ID: Iff TSU registers exist on a given [G]Ether controller, they always include the CAM entry table registers (TSU_ADR{H|L}), thus the check for invalid TSU_ADRH0 offset in __sh_eth_get_regs() is useless... Signed-off-by: Sergei Shtylyov --- drivers/net/ethernet/renesas/sh_eth.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 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 @@ -2153,22 +2153,17 @@ static size_t __sh_eth_get_regs(struct n add_tsu_reg(TSU_POST2); add_tsu_reg(TSU_POST3); add_tsu_reg(TSU_POST4); - if (mdp->reg_offset[TSU_ADRH0] != SH_ETH_OFFSET_INVALID) { - /* This is the start of a table, not just a single - * register. - */ - if (buf) { - unsigned int i; + /* This is the start of a table, not just a single register. */ + if (buf) { + unsigned int i; - mark_reg_valid(TSU_ADRH0); - for (i = 0; i < SH_ETH_TSU_CAM_ENTRIES * 2; i++) - *buf++ = ioread32( - mdp->tsu_addr + - mdp->reg_offset[TSU_ADRH0] + - i * 4); - } - len += SH_ETH_TSU_CAM_ENTRIES * 2; + mark_reg_valid(TSU_ADRH0); + for (i = 0; i < SH_ETH_TSU_CAM_ENTRIES * 2; i++) + *buf++ = ioread32(mdp->tsu_addr + + mdp->reg_offset[TSU_ADRH0] + + i * 4); } + len += SH_ETH_TSU_CAM_ENTRIES * 2; } #undef mark_reg_valid