From patchwork Sun Feb 18 15:21:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 874878 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (2048-bit key; unprotected) header.d=cogentembedded-com.20150623.gappssmtp.com header.i=@cogentembedded-com.20150623.gappssmtp.com header.b="faE40Ik2"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zkrF90fvkz9sWt for ; Mon, 19 Feb 2018 02:21:16 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751372AbeBRPVK (ORCPT ); Sun, 18 Feb 2018 10:21:10 -0500 Received: from mail-lf0-f65.google.com ([209.85.215.65]:40592 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751337AbeBRPVI (ORCPT ); Sun, 18 Feb 2018 10:21:08 -0500 Received: by mail-lf0-f65.google.com with SMTP id 37so9894847lfs.7 for ; Sun, 18 Feb 2018 07:21:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=to:cc:from:subject:organization:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=+BZB5ZC2LgErUxS6SYYZG6IscAka+6+Y72tnR2Rfv6w=; b=faE40Ik28MVWHLa4AqS3VMynVtpCsZpjD9Y31MMAvOSuz5KtHt91DulAuuFaoj0Fy6 c9Z+fvESQtFBv4JVE+DHiSj9lY9Al5H6mJUDKZm6bxyCAzyTpCcUTiFCfb66bViAx35O XFKolu5sDSKKd2x5WWX0koEqGPJGW6VyradghanZ1hgmGXDdLvSPqgQQqKxjkJNnp55T P/vjgwDaeQCR8XdYnO4pLYFQBzh5zPJ3avzHmEv9CqqLE01R5hpKAzhrhEEf571IwhwC xZiroxyKOjGtBT/lKV8S2YnAyaMfVPmqRSKZtEFBMwtmYDsUbwVwvlW292TvwoCgV+re gVAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:cc:from:subject:organization:message-id:date :user-agent:mime-version:content-language:content-transfer-encoding; bh=+BZB5ZC2LgErUxS6SYYZG6IscAka+6+Y72tnR2Rfv6w=; b=A0RsorfcyP7anQv8QNLrwWAcrIdISmpeoYCvW+0sqP+yJpUs3hOR5nE3BNf9H90UOL oZ7SYF8QZ/DHVxgqHzN9q/urrAcwvjP5C4blan15rEIbwqktl2vzVMWLm24tn7E0s77+ J7sO+/080VEzmAizjpN3Z8X6/an/bKjjb+VLX9TMllyauObSeUomHjQxYaRl/sBr8xy9 BS1sIAmDg5bEKaN8S2Pu9LYVs3hSIFNlucuFowu7ryW9mhqFHZEK70PFc0+3PUAHMVhM EEpEsTzlJnWDQaNVXcMPRTa5Eu6ku5qndVcvZBsBp0LghN9TBwJtOpgA6PJbHNd7CrpA Q2TQ== X-Gm-Message-State: APf1xPDx5r3vKwxvSCOaSjShi8tsP54PZ3Ewo0B8ZC8LI3j2nrHH1Z8D XGOtmICd123HITpT/LIRN4cYKQ== X-Google-Smtp-Source: AH8x225a2qXF3fSca3biSN2caKyqSEsSyVTewq17fg8BGnHyJmSrO1+FVVlMngsouq3fVJmjmnWIMA== X-Received: by 10.46.87.2 with SMTP id l2mr2754736ljb.80.1518967267108; Sun, 18 Feb 2018 07:21:07 -0800 (PST) Received: from wasted.cogentembedded.com ([31.173.80.86]) by smtp.gmail.com with ESMTPSA id l5sm3631363lje.58.2018.02.18.07.21.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 Feb 2018 07:21:06 -0800 (PST) To: "netdev@vger.kernel.org" Cc: linux-renesas-soc@vger.kernel.org From: Sergei Shtylyov Subject: [PATCH] sh_eth: simplify sh_eth_check_reset() Organization: Cogent Embedded Message-ID: <0531592f-d845-d6b6-dbd4-bf01515b308c@cogentembedded.com> Date: Sun, 18 Feb 2018 18:21:05 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 Content-Language: en-MW Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The *while* loop in this function can be turned into a normal *for* loop. And getting rid of the single return point saves us a few more LoCs... Signed-off-by: Sergei Shtylyov Reviewed-by: Geert Uytterhoeven --- The patch is against DaveM's 'net-next.git' repo. drivers/net/ethernet/renesas/sh_eth.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 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 @@ -962,20 +962,16 @@ static void sh_eth_set_default_cpu_data( static int sh_eth_check_reset(struct net_device *ndev) { - int ret = 0; - int cnt = 100; + int cnt; - while (cnt > 0) { + for (cnt = 100; cnt > 0; cnt--) { if (!(sh_eth_read(ndev, EDMR) & EDMR_SRST_GETHER)) - break; + return 0; mdelay(1); - cnt--; } - if (cnt <= 0) { - netdev_err(ndev, "Device reset failed\n"); - ret = -ETIMEDOUT; - } - return ret; + + netdev_err(ndev, "Device reset failed\n"); + return -ETIMEDOUT; } static int sh_eth_reset(struct net_device *ndev)