From patchwork Sat Mar 31 21:23:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 893889 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="Q7TBNjPP"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40DBLm0KxQz9s0y for ; Sun, 1 Apr 2018 07:24:00 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752609AbeCaVX4 (ORCPT ); Sat, 31 Mar 2018 17:23:56 -0400 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) 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=DC9s0MZc5czYtJBSCUOUnbpVXbvjnLY2nA1n3pZg0YY=; b=Q7TBNjPPP1XTu8paKF+8ePOkrXwFycMVYef5TCv3y/DvHldVYsbF26KI0f9C8DkTtU W058P/zNxiGGZa0kw1i5yd52aGWsMdb7KFIbogEX7v+1n0KTfsKJuyvaY0zQIM0COEfT SzIHsrr/xWDBj2w1vjSnisdHZ2oegJhZC1rN8yOGJkcGOkbw6RyJCcPAoDKWMb0E1B5r xOzsT2+RTIXCjGxX03gptPJMcYoRol1CkuY2TUR5hKItCqCrPfryaYYUgxqQV3Bo3Qyl fqrY4d2o8/UfdboW/pflXpzvaaXMLK+0Ws2Hsyy1Rh6WmFJEQ3FkcnFh2syyINdJJ6oP 5Dew== 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=DC9s0MZc5czYtJBSCUOUnbpVXbvjnLY2nA1n3pZg0YY=; b=Tzdz1Zqkzzic4XedaMDYMGif0Tl/zVHkeOx3leVxPw49MuAqaVslo/ZWTNi5rA3oS0 T+uP/pJE5yw7aPKJ6AoB3W94vBOaU2ZIibuAzycKzjHDSfBlTZoJuAxsKeOhH23v17g2 APN1WReFPHVpD9exY/bYi5JG5MJIk8NtqwzIMfoNTuJitcW9K5ZBgqdyjhHB3vGPDJ2E NoUpKOPYTQfGPhrYYFAZQnHGyLrkKt50lrUnY7My3No508MgxcvABfOA2gKlvwJWCi2k at2gxXBulsoZLp99yHoC3SnhQDzR85/Mjn2QWQ4jgSeZnCCyrCV8jhL2yW9k6Wk+/BJR bK3g== X-Gm-Message-State: ALQs6tDCc8BMSwBvlkqQAxYjXr29/mkGVIzNiqK/V2Wk9V8HrrMikH8X BOQs68UAEfsPK7XiZR1kjvKbMlsyZaY= X-Google-Smtp-Source: AIpwx4+UcOLaEAO3tR+GNgqW7eG+YJihtZsS7UtnUxIgCbn2a3Yn/zxgX0rBIddDNSS0Ee3rQc8SYg== X-Received: by 2002:a19:e819:: with SMTP id f25-v6mr2506200lfh.62.1522531433327; Sat, 31 Mar 2018 14:23:53 -0700 (PDT) Received: from wasted.cogentembedded.com ([31.173.87.205]) by smtp.gmail.com with ESMTPSA id c29sm2000592ljd.30.2018.03.31.14.23.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 Mar 2018 14:23:52 -0700 (PDT) Subject: [PATCH net-next 2/2] sh_eth: kill useless check in __sh_eth_get_regs() From: Sergei Shtylyov To: netdev@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, linux-sh@vger.kernel.org References: <998029b4-9400-ebc3-51c1-623c3f72b6cc@cogentembedded.com> Organization: Cogent Embedded Message-ID: <47af0c2c-bba9-a346-1925-06c99142cbb2@cogentembedded.com> Date: Sun, 1 Apr 2018 00:23:51 +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: <998029b4-9400-ebc3-51c1-623c3f72b6cc@cogentembedded.com> Content-Language: en-MW Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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