From patchwork Mon Nov 28 11:59:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 26668 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp5609123wrr; Mon, 28 Nov 2022 04:03:19 -0800 (PST) X-Google-Smtp-Source: AA0mqf43n+8j7Sw3Kxg6xAK3vWx99n31cTXeXBnDitINGq1+UroadrvkGuCv5E8Gaa1MkhB7Y8h4 X-Received: by 2002:a17:902:e74d:b0:186:887b:baa2 with SMTP id p13-20020a170902e74d00b00186887bbaa2mr45028788plf.27.1669636998866; Mon, 28 Nov 2022 04:03:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669636998; cv=none; d=google.com; s=arc-20160816; b=0qkFL1TLawBJHyyTEFKfPpmySTEpnhiIQKoYyjkQEsRUvtKCNfai65ZMSqbCOE9p8Z FrZ90Hw9TQCc3MzjVH+9OtapEDKfPdArnkFTnXPlHaUU436IMmVmlqXBk1lrp9P4Ocny qUvahLJckRUEMrui0TWOtpMqyudKIBAnaqdoUMMf46UcwiVbsuYR62nVsq6bgdf3Vodj BdA3vFo66lt4qHeC+3JN+3R3KgP5YDl16kBy93vsWhIeuf3hTGwl686N83m3JGvc1cBA MWmnHrOqT2qME/0et23ysLCGzEFEo03tvUAK9af9h4U1/TmC7v0aI4QBcKsTFmtc+8Q9 ClZg== 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=7qXe3iguFHZ1DLDkTinrz5RaXGAq6HxhhR8SQ6berQw=; b=phAv+FIR6mCpLGEtDX8old3Vd4DMPBH7WO6tsDdOFzJ5Ysv1XkaI9UxZjCNRm1IF4m jQ4hu15MXXBtumJweS3KY5KyOQa0D4JK1c24RuHA6OBW95RGXm/quto5VpB4+A2YZfgB CSojajCGthgBv6oTnsdnsZVB8/Uva48qW72oZPIUr0S+SttA9o727chw//tP2G9reW/u he7aPEo/dEUTKzpABZNiBEPFXNA6Cbfo6GmKaLKI9oDb/58+e3M/5EDYjSvLKU4UbRBm krD9FwMx6+but0hsFaVxVz8oIvHd5riAsCzLYZXu9UYRYIwWPltPqs2pa4UYz14/KixR d44A== 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 189-20020a6300c6000000b00477d61af548si10746683pga.639.2022.11.28.04.03.00; Mon, 28 Nov 2022 04:03:18 -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 S231551AbiK1MA5 (ORCPT + 99 others); Mon, 28 Nov 2022 07:00:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231336AbiK1MAQ (ORCPT ); Mon, 28 Nov 2022 07:00:16 -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 7123F18B19 for ; Mon, 28 Nov 2022 04:00:14 -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 1ozcnt-0003r6-Bl; Mon, 28 Nov 2022 13:00:05 +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 1ozcnr-000o9f-Nu; Mon, 28 Nov 2022 13:00:04 +0100 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1ozcno-00GzgP-1r; Mon, 28 Nov 2022 13:00:00 +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 22/26] net: dsa: microchip: ksz8_r_sta_mac_table(): make use of error values provided by read/write functions Date: Mon, 28 Nov 2022 12:59:54 +0100 Message-Id: <20221128115958.4049431-23-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 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?1750741285992967117?= X-GMAIL-MSGID: =?utf-8?q?1750741285992967117?= Read/write operations may fail. So, make use of return values. Signed-off-by: Oleksij Rempel --- drivers/net/dsa/microchip/ksz8795.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz8795.c b/drivers/net/dsa/microchip/ksz8795.c index b7487be91f67..1de33ceb50de 100644 --- a/drivers/net/dsa/microchip/ksz8795.c +++ b/drivers/net/dsa/microchip/ksz8795.c @@ -336,19 +336,26 @@ void ksz8_port_init_cnt(struct ksz_device *dev, int port) } } -static void ksz8_r_table(struct ksz_device *dev, int table, u16 addr, u64 *data) +static int ksz8_r_table(struct ksz_device *dev, int table, u16 addr, u64 *data) { const u16 *regs; u16 ctrl_addr; + int ret; regs = dev->info->regs; ctrl_addr = IND_ACC_TABLE(table | TABLE_READ) | addr; mutex_lock(&dev->alu_mutex); - ksz_write16(dev, regs[REG_IND_CTRL_0], ctrl_addr); - ksz_read64(dev, regs[REG_IND_DATA_HI], data); + ret = ksz_write16(dev, regs[REG_IND_CTRL_0], ctrl_addr); + if (ret) + goto unlock_alu; + + ret = ksz_read64(dev, regs[REG_IND_DATA_HI], data); +unlock_alu: mutex_unlock(&dev->alu_mutex); + + return ret; } static void ksz8_w_table(struct ksz_device *dev, int table, u16 addr, u64 data) @@ -463,11 +470,15 @@ static int ksz8_r_sta_mac_table(struct ksz_device *dev, u16 addr, const u8 *shifts; const u32 *masks; u64 data; + int ret; shifts = dev->info->shifts; masks = dev->info->masks; - ksz8_r_table(dev, TABLE_STATIC_MAC, addr, &data); + ret = ksz8_r_table(dev, TABLE_STATIC_MAC, addr, &data); + if (ret) + return ret; + data_hi = data >> 32; data_lo = (u32)data;