Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp14747274rwb; Mon, 28 Nov 2022 04:41:05 -0800 (PST) X-Google-Smtp-Source: AA0mqf5l87zRIU7ELb67ekj2ndehHerguLwOMguZ6Op2kWG77Psrsjmw9pr2ofy0y2+VTaaS9PTV X-Received: by 2002:a17:906:3fd0:b0:7af:9bff:8de6 with SMTP id k16-20020a1709063fd000b007af9bff8de6mr25603040ejj.91.1669639265591; Mon, 28 Nov 2022 04:41:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669639265; cv=none; d=google.com; s=arc-20160816; b=AnauX2MoN3SK7FwH2qMQID1LSuAMVlp7PecQSM4MgxAcAACiYF7vjtLLem88je5Hf+ k/el540OND5lK3j4yCSbg3mAVbkfC+4h65pJqrTkdHcSMSIaRuHWZME2B49qRkDunYxq /OyOI2ejUlg6U34bDNLCYyem0gVaPqZnjO9Kbj7judM1zGwIlkm0MN9YClinaRsm0K1w Ag5IvO2xubgtoyCAoLnuFIydjnRCUxxrUeRH6Q/+JPnZ0JaMdeVSg2rxeE8vIhAk8w3Y Nhi3LHVMkzYZgAlDStZSNacPamaMhF+q5dNZ2gwScVI3QFAbu1UWYIpnNRGd/742Olbo ZMeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=4eBcOkvij+NsANuIbFZRzSBlIGg52zAPjOtRjuPtbHo=; b=dcm7J++4pBy9bfW3qBTaslp67yVN95uFCAHFaxq1e7Ua7g0s9EIhAZV9GOx3oxrV21 ZEQ4zYr5ArN2rqTZlFF9Bah+q2w/GlfL4OjO441kwzGGWPxKgPzMhxT9Zy7JIyy4nlOw Axwby1bqWdTIEZFFW9xvKwip0I56jOrEKITn5iNSQc4oRe7XKhqUuN5ICMhI9rNgZWFW LDU524k3s6Lbg9nvFFQEfqj2PIUxoWv8205tu++IxwsDTHVsODagVOfVrLHSdSo0YdiL g2r7Wa01W4uQ44dXa0TzGgbReb9J2xpdVbsTY1rFQTTCp78jEksuoaI4Cw9ciunUEs6z Ll2A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id dm19-20020a170907949300b0078db70cc9b8si10648521ejc.606.2022.11.28.04.40.45; Mon, 28 Nov 2022 04:41:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229896AbiK1MBr (ORCPT + 84 others); Mon, 28 Nov 2022 07:01:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231379AbiK1MAR (ORCPT ); Mon, 28 Nov 2022 07:00:17 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 512E618B07 for ; Mon, 28 Nov 2022 04:00:15 -0800 (PST) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ozcnr-0003n7-NP; Mon, 28 Nov 2022 13:00:03 +0100 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1ozcnp-000o8d-SX; Mon, 28 Nov 2022 13:00:02 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1ozcnn-00Gzf0-UV; Mon, 28 Nov 2022 12:59:59 +0100 From: Oleksij Rempel To: Woojung Huh , UNGLinuxDriver@microchip.com, Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Oleksij Rempel , kernel@pengutronix.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Arun.Ramadoss@microchip.com Subject: [PATCH v1 16/26] net: dsa: microchip: ksz8_r_dyn_mac_table(): use ret instead of rc Date: Mon, 28 Nov 2022 12:59:48 +0100 Message-Id: <20221128115958.4049431-17-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221128115958.4049431-1-o.rempel@pengutronix.de> References: <20221128115958.4049431-1-o.rempel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ore@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Other parts of this file use ret. So, unify it. Signed-off-by: Oleksij Rempel --- drivers/net/dsa/microchip/ksz8795.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c index 2674fd553851..1677f61b138a 100644 --- a/drivers/net/dsa/microchip/ksz8795.c +++ b/drivers/net/dsa/microchip/ksz8795.c @@ -405,7 +405,7 @@ static int ksz8_r_dyn_mac_table(struct ksz_device *dev, u16 addr, u8 *mac_addr, u64 buf = 0; u8 data; int cnt; - int rc; + int ret; shifts = dev->info->shifts; masks = dev->info->masks; @@ -416,12 +416,12 @@ static int ksz8_r_dyn_mac_table(struct ksz_device *dev, u16 addr, u8 *mac_addr, mutex_lock(&dev->alu_mutex); ksz_write16(dev, regs[REG_IND_CTRL_0], ctrl_addr); - rc = ksz8_valid_dyn_entry(dev, &data); - if (rc == -EAGAIN) { + ret = ksz8_valid_dyn_entry(dev, &data); + if (ret == -EAGAIN) { if (addr == 0) *entries = 0; goto unlock_alu; - } else if (rc == -ENXIO) { + } else if (ret == -ENXIO) { *entries = 0; goto unlock_alu; } @@ -447,12 +447,12 @@ static int ksz8_r_dyn_mac_table(struct ksz_device *dev, u16 addr, u8 *mac_addr, mac_addr[1] = (u8)data_hi; mac_addr[0] = (u8)(data_hi >> 8); - rc = 0; + ret = 0; unlock_alu: mutex_unlock(&dev->alu_mutex); - return rc; + return ret; } int ksz8_r_sta_mac_table(struct ksz_device *dev, u16 addr, -- 2.30.2