Received: by 2002:ab2:1149:0:b0:1f3:1f8c:d0c6 with SMTP id z9csp2058213lqz; Tue, 2 Apr 2024 06:15:59 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVRSLOOzAtd9qPsoZp2sRLfw1NQyUyCQRtlXU9oWHRzXipM/Uv7BuH+zkyDnebgjh4lbxTYwvAsNSsgvPUl+Co4b0g2dfaeBPPwn8E98w== X-Google-Smtp-Source: AGHT+IFtV96xjLb+db2/ntdyAggEkh6z4HATMc150EKrINmwHiMRoZvpt3w2FEPa/uSH0Y3dc2Bw X-Received: by 2002:a17:907:980d:b0:a4e:37e1:62f4 with SMTP id ji13-20020a170907980d00b00a4e37e162f4mr9473099ejc.18.1712063759075; Tue, 02 Apr 2024 06:15:59 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712063759; cv=pass; d=google.com; s=arc-20160816; b=gNNQRA/8RpEhgSsW6/0jpnp1zwM37FsKoKsPSkiOUXrIvllokv+qFRflYrp2EeX2/E hs1qyPl734kznDf2KRgzDwr8XCdc8THtgC72ggUfnmaYSItkqaq0vx6fyXMu1ul6x9aX fCsBw+3yF4nwy3WdkR4+M/0SLkSjvJXsU5uvsFA9PhUAcp6xIdyH5NFaUYBSHreIRd/k ffrNIp+qiwC418QZX9YYsTz+7uPmElKoXpQ1MXpn8rwYa+DB89ZR7arMBZXPWdmkPjza dadJl1doRVmvSd5c3jCloDylCNzyU9tuIBEUnfknvrvZZt5xvNvWwfBkRwq2k6wh/EeW XVAw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=poXTSk6eGJhblXNX9fgcAEPsGtmBiCBs4LAbsqn4vLs=; fh=+wuPl0jVtcYGOKyQ4dCrYwpLO51Md4SLm1XlQV1l1VE=; b=mis0T3Pw7Mp+aVQaTU1KxvbRpj1c8JDG2d1z8YANgOfdHn0IEiz/ZNgh0Q5n4OlFWd MoPBqdNVeGONhU+/CahBOrayy2Ff+1aVW7bJQJw6+DVNPUNSti568b2292ws1bPDAl1X +oHG8NU6FR2P5jwS5XUaYcgU9w+IwBagNhhnYfbnZpntEgBMY0S/cfaFET4lIYnCKTog 4Csckd651tDDJ0RhtMUmJu+5cRcB6y8eoci0AcJA6DmsYZcVTzOksklPTiYZHkfUmu81 7hxn012x/c0Od09J6i29525jHL+oF8NipWdA2WWZR0vHSQ3Lipfuzot7s4ywcqd3YTzR R4Ww==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=pengutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-128018-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-128018-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id y10-20020a1709063daa00b00a474b7dd311si5739694ejh.694.2024.04.02.06.15.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 06:15:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-128018-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=pengutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-128018-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-128018-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 975731F227D8 for ; Tue, 2 Apr 2024 13:15:58 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id DCC3D12D76A; Tue, 2 Apr 2024 13:13:55 +0000 (UTC) Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6E97582898 for ; Tue, 2 Apr 2024 13:13:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712063634; cv=none; b=q5D/O6ozZMrrDvIN50oXTq/+qaBILbgiqmeRtz1YTOrLVlVy+ijFBSUwvkrOEXtsaCCcUhQYkhgHAzJEVmNlr2meF0IDpwxzkJDOQQH2nDrsf3Suzvi+o2RvDTXe/xRsRUQOA84dlluHhFGUd9F5bOXm5pMFTLZ3J6cShsCFVlA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712063634; c=relaxed/simple; bh=L1PTgioQ9UTXOR1GMlJUXHK63uWuG9gFutlyR0MyD9s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ChzJwpj9dL0TqFtYe/5AzPzbSu3sFShD9moFJOMj7KB9nxHA3nT7O2Ag8tC2dMSs8581dWP6v4YEWz537FHq+BEDWzvcNZnx9s5is9IPR6/DbdytgnMaxSAhV8BVi7k3IjPHwe5Of1Q/Z+iiAPF0pdgpYaiJ3bWN15rcBZQuiVc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rrdxN-0007Nl-MW; Tue, 02 Apr 2024 15:13:41 +0200 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rrdxM-009zW6-Gp; Tue, 02 Apr 2024 15:13:40 +0200 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rrdxM-006OpX-1R; Tue, 02 Apr 2024 15:13:40 +0200 From: Oleksij Rempel To: "David S. Miller" , Andrew Lunn , Eric Dumazet , Florian Fainelli , Jakub Kicinski , Paolo Abeni , Vladimir Oltean , Woojung Huh , Arun Ramadoss Cc: Oleksij Rempel , kernel@pengutronix.de, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, UNGLinuxDriver@microchip.com, =?UTF-8?q?S=C3=B8ren=20Andersen?= Subject: [PATCH net-next v1 5/8] net: dsa: microchip: ksz8: Unify variable naming in ksz8_r_dyn_mac_table() Date: Tue, 2 Apr 2024 15:13:36 +0200 Message-Id: <20240402131339.1525330-6-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240402131339.1525330-1-o.rempel@pengutronix.de> References: <20240402131339.1525330-1-o.rempel@pengutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: 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.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Use 'ret' instead of 'rc' in ksz8_r_dyn_mac_table() to maintain consistency with the rest of the file. 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 1962195e16a6f..d5ec4b9772752 100644 --- a/drivers/net/dsa/microchip/ksz8795.c +++ b/drivers/net/dsa/microchip/ksz8795.c @@ -419,7 +419,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; @@ -430,12 +430,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; } @@ -463,12 +463,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; } static int ksz8_r_sta_mac_table(struct ksz_device *dev, u16 addr, -- 2.39.2