From patchwork Mon Nov 28 12:00:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 26702 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5610412wrr; Mon, 28 Nov 2022 04:04:50 -0800 (PST) X-Google-Smtp-Source: AA0mqf5X7fgKxnLk0eWZdUDnKWjL7jriA9jlJfCBr/SvW/HXVrhQ8URG7+t1w+CkoF4Y61djmblM X-Received: by 2002:a62:60c7:0:b0:56b:94f5:400c with SMTP id u190-20020a6260c7000000b0056b94f5400cmr31787781pfb.31.1669637090480; Mon, 28 Nov 2022 04:04:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669637090; cv=none; d=google.com; s=arc-20160816; b=V7KQPa+/6qVwDRpA4v+nx2YOS3/qV1T7otZLhmjxsi51XfKTHAEsmpmpapZ39uW6x8 Y3S51gYh9DQJ2m5Z1kQhp+EWR6byFN+C4JgbOt/LrIGKkFB0yLDE+TU7c9Md4/0yPWzJ 3sjZDH6PUtygZfk3twAwPRlreJJXLAUa8OR5N7V38TfvTe4nAD4i92Q3Km8OYvmhVaPv 16pCiG+xFHncrOhsE0c8rE0Gr4pthXhXEMHJZvEZRvo/nClIeGipO5BKEWMh7FcaPe2M GcWuLOOGflJCPtefLDD6D0NLrjwpbthb5wCID6JK1pB5WwnzqdU20Mua8dWFARY150gP HBoA== 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=3wVI1YZ79SizMVkbgfkpOmYtT0p5T5ubiYCU+KkkmcQ=; b=zBi3kr9+Qhg2TvBFA1OaDuJ7iwUCcYf0RedE7eB1r8x17y12VG9ySGBrwruEXR11W8 OPA4U6k6mohTqfXq1g4X7ygp5iVuHU4DYMrdr5lZHpNYOjxwIXGVBttkFls4VmEdLsnK 88GyPMWq8GlQfPf2YPJkEvQQYGJJnyHQEf9TX+DOCz7+//3NH4mlOeY7d03Jzq5jywTf dpVq71fUizB4Qe4vDICriHedWgt08rIlGKAXSuowt2Gzqxl5tY5oBZ3tMr9gtu1SMk4T CXGgcszhl0lS1lVIcgCoBp4h8s56II0x3yl/JC1iDqWBCru+kB4o6jaDeqyXb7cEPpVC ulHw== 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 62-20020a630141000000b004778207ac4dsi11822848pgb.396.2022.11.28.04.04.34; Mon, 28 Nov 2022 04:04:50 -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 S231822AbiK1MDq (ORCPT + 99 others); Mon, 28 Nov 2022 07:03:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231504AbiK1MAs (ORCPT ); Mon, 28 Nov 2022 07:00:48 -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 0FE2B1A206 for ; Mon, 28 Nov 2022 04:00:47 -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 1ozcoS-0005LP-UP; Mon, 28 Nov 2022 13:00:40 +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 1ozcoR-000oBV-EY; Mon, 28 Nov 2022 13:00:40 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1ozcoO-00H6R0-H2; Mon, 28 Nov 2022 13:00:36 +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 19/26] net: dsa: microchip: ksz8_r_dyn_mac_table(): use entries variable to signal 0 entries Date: Mon, 28 Nov 2022 13:00:27 +0100 Message-Id: <20221128120034.4075562-20-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221128120034.4075562-1-o.rempel@pengutronix.de> References: <20221128120034.4075562-1-o.rempel@pengutronix.de> MIME-Version: 1.0 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750741381620908142?= X-GMAIL-MSGID: =?utf-8?q?1750741381620908142?= We already have a variable to provide number of entries. So use it, instead of using error number. Signed-off-by: Oleksij Rempel --- drivers/net/dsa/microchip/ksz8795.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c index 3348f5c25942..31c77e086a9d 100644 --- a/drivers/net/dsa/microchip/ksz8795.c +++ b/drivers/net/dsa/microchip/ksz8795.c @@ -385,19 +385,11 @@ static int ksz8_valid_dyn_entry(struct ksz_device *dev, u8 *data) } while ((*data & masks[DYNAMIC_MAC_TABLE_NOT_READY]) && timeout); /* Entry is not ready for accessing. */ - if (*data & masks[DYNAMIC_MAC_TABLE_NOT_READY]) { + if (*data & masks[DYNAMIC_MAC_TABLE_NOT_READY]) return -ETIMEDOUT; - /* Entry is ready for accessing. */ - } else { - ret = ksz_read8(dev, regs[REG_IND_DATA_8], data); - if (ret) - return ret; - /* There is no valid entry in the table. */ - if (*data & masks[DYNAMIC_MAC_TABLE_MAC_EMPTY]) - return -ENXIO; - } - return 0; + /* Entry is ready for accessing. */ + return ksz_read8(dev, regs[REG_IND_DATA_8], data); } static int ksz8_r_dyn_mac_table(struct ksz_device *dev, u16 addr, u8 *mac_addr, @@ -425,13 +417,13 @@ static int ksz8_r_dyn_mac_table(struct ksz_device *dev, u16 addr, u8 *mac_addr, goto unlock_alu; ret = ksz8_valid_dyn_entry(dev, &data); - if (ret == -ENXIO) { - *entries = 0; + if (ret) goto unlock_alu; - } - if (ret) + if (data & masks[DYNAMIC_MAC_TABLE_MAC_EMPTY]) { + *entries = 0; goto unlock_alu; + } ret = ksz_read64(dev, regs[REG_IND_DATA_HI], &buf); if (ret) @@ -997,8 +989,6 @@ int ksz8_fdb_dump(struct ksz_device *dev, int port, u8 src_port; ret = ksz8_r_dyn_mac_table(dev, i, mac, &src_port, &entries); - if (ret == -ENXIO) - return 0; if (ret) return ret;