Received: by 2002:ab2:1149:0:b0:1f3:1f8c:d0c6 with SMTP id z9csp2681397lqz; Wed, 3 Apr 2024 05:51:01 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUL/EA/X235zJ0ZvctVSpfwpYnPe9go6YfY3jekHaif/yqCdwKO11AjDxj5CnGAv2XlnT1zFXbH9fK5gMC9hAFtEZfIjQ9wlc0araKpGw== X-Google-Smtp-Source: AGHT+IEqmOIgwsEkRP9kJ/o7r1MOGzpEoIIStQvfw2y3hy+yD8s98aAw/HxAWPqbCOStWCoukDBk X-Received: by 2002:ac8:5a95:0:b0:434:4673:572c with SMTP id c21-20020ac85a95000000b004344673572cmr726096qtc.0.1712148660899; Wed, 03 Apr 2024 05:51:00 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712148660; cv=pass; d=google.com; s=arc-20160816; b=e4qZVUY/NoI3+XDXtgHI7Pr1fYK7d19i54h7/VRemEHle4MQhMBFmdbGpKX5tPgFft Im7hKD0VzJDhySiFI25cGQR3jGO2oBiwUE4ua1jdjh1ct6apK0nEoxq5KOaXL4wp0Fyh js8r2/nUkVyj5QtZOHomgGuOZPpE1jyRCPE5wPIehVLC3s0PLJYvB5hETlyrO1BI9lJd SfLhLsvBfXw+ylfjlvuyGgD5/p+rztJIqOysGZ7G4c8nB/i0bA8b3IESSjIvEsuI+NwJ ucbhE5FjuXSfxV3wieDTYzO0CLQfDkvSnDkS0OprPt5WJrjIESBh4MSan20Cl5O2H5QC ovTw== 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=GmKp4Aw/6PIH9ogc+04QOhqXTmxmh+o97uY6HO+/sgA=; fh=+wuPl0jVtcYGOKyQ4dCrYwpLO51Md4SLm1XlQV1l1VE=; b=kAdo8boIHy6pVzzesBLMVxXRSI1FksBv36pi2kq2MOBMnH5MOcgSAjShcXEhyu5RRr UTBlpuTvNWWyM102aIvD6OKvhFP9WAb7EFuIZ/Bje69hqLfGm6rXKB60hmQojrx/hPPp uejGvex1EDHBfkZNSxmThHHx0gB1vb4b6gTtVhu8n2CfUU5cn/gJMtH3EhRfk86+/Z+g FtdpNFbU0k54OfNyoBjShU8W5GCR04zkc0Vq81Ix6LVW4SvNqi9vuUwLerH5R8nwtUAq u3aloWVbQWFoVUpDNzfJrCkJ5h6T6M23RYLrJwCCksJprFRewwMs3FfEJfO6hyouk2A8 UDSg==; 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-129737-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-129737-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id j3-20020ac85c43000000b004343a5e3551si3306059qtj.136.2024.04.03.05.51.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Apr 2024 05:51:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-129737-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=pengutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-129737-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-129737-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 931681C26172 for ; Wed, 3 Apr 2024 12:51:00 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 39939147C65; Wed, 3 Apr 2024 12:50:53 +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 EA5A5146A7E for ; Wed, 3 Apr 2024 12:50:50 +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=1712148652; cv=none; b=S/+rw6o90dWIK2uX4ARlT3PhWfhpVO9uE7jykrNbHb2GsNf/ziH19Docwdq2h9Mlk0NAfjET6Xajnfs1YXFgAZZwjn+tuZrbX6UDjLsnOJnW3Ea5+yi07GNwTknBh/JMqMg5sl0SsFtxiPYKGzoc71QfgQ8K2EGT+b87sTOrAO0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712148652; c=relaxed/simple; bh=5P4zD/4OWL7uamSzrPFxBF1Ka6K9JxmalgF6ZlMlbQY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iYJO93N1cjZarTVjPoaHYpNzzK7aLI6tMk0UxhJrh7O1TSth/zn4rszGfbzEQ/Upum+2KeYfBzWzD/47TLDiGuqn7jFgn+l7rGBf5iay8UvBSN/m2UE7HSzbt3CoL6W+c+zUkyI/3czeczF17G5p2rhtiaSy9TD31CaOIvlN/7E= 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 1rs04h-0005y5-0Z; Wed, 03 Apr 2024 14:50:43 +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 1rs04f-00ABEf-77; Wed, 03 Apr 2024 14:50:41 +0200 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rs04f-00EKYp-09; Wed, 03 Apr 2024 14:50:41 +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 v2 5/8] net: dsa: microchip: ksz8: Unify variable naming in ksz8_r_dyn_mac_table() Date: Wed, 3 Apr 2024 14:50:36 +0200 Message-Id: <20240403125039.3414824-6-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240403125039.3414824-1-o.rempel@pengutronix.de> References: <20240403125039.3414824-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. Reviewed-by: Vladimir Oltean Acked-by: Arun Ramadoss 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 d258fb607b4af..5765d23bc6edc 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