From patchwork Tue Apr 11 17:24:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oleksij Rempel X-Patchwork-Id: 82097 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2743765vqo; Tue, 11 Apr 2023 10:35:38 -0700 (PDT) X-Google-Smtp-Source: AKy350Yuw6g+MnUWRsQGiZzOoQW6oO4hmrKODvRNg6LY4k44AtbJBhHYX+a1FjoccRBwVbb80i1e X-Received: by 2002:a17:907:a08e:b0:946:f79b:e785 with SMTP id hu14-20020a170907a08e00b00946f79be785mr11090303ejc.2.1681234538518; Tue, 11 Apr 2023 10:35:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681234538; cv=none; d=google.com; s=arc-20160816; b=qW+Vl9y2yPHgJ1z3HsDCWlJHtKfCR8uw6spZWjEO90KJU79qE5Y6IyK5Tp6Jw0VbV6 RS1eSEHvuQYbYEeCzmDSTwS08VjSjld3dTlvNounVcpHuU/tyye/20oPslP7xPnlvho+ hNEWJksgf/hTR/X1mQb/p2uEkvm+cT/UbheQS/0pAUkHXyQp89ZAWcLlc6iwosuqUZzo RVf7KbPt8LbhLOIVbmP51IPaz53hvHq4ODEfrs7xOozQaOHJrOfuIoNaRW17eDSjzIzk SS2gmg75sEeW/JvTuB30FHb6nqosDorV8q9QT81Oh+xgzrxbK8btwVbeye+QdcnBRM30 gZmQ== 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=nk/MQvXb+wyY69cH+KxNjJCq1/1/jVik5rH4bzGVG/Q=; b=xqz6cM1Wmh7y9NxOZuSYdY5bpg9HrdoBMqYAb+QXTcQT9m/TO+4kYWMnh3tISly7Zf irS089lRY5r3YZO2EmGkZz+VvOq60I/MweRsUAMXGBYamb8lbrJjll0DysVACWRVvO7R +1x8XG+jAWlax3dlEJtTGcuwjziWiYJJtxvvZbhTCwPtjQQX8KsRaewz3p6Ay3zVBv/S t+t6/rGHySvEw+CrYBuMmSte87OEnJ+lbSBzON7qMgrDelMzX5Ezt/Ngz8ZuPE6LNO06 pPiTqBm0wk7DpDNR2bUc61nOl9z/uegA5CP+32xgJIK8LyGrdxyPYedlfNdj9+9bdDXb cFqQ== 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 oz18-20020a1709077d9200b0094a51956f6dsi1777298ejc.142.2023.04.11.10.35.14; Tue, 11 Apr 2023 10:35:38 -0700 (PDT) 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 S230124AbjDKRZT (ORCPT + 99 others); Tue, 11 Apr 2023 13:25:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230002AbjDKRZO (ORCPT ); Tue, 11 Apr 2023 13:25:14 -0400 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 551461FD0 for ; Tue, 11 Apr 2023 10:25:12 -0700 (PDT) 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 1pmHjp-0001ym-9L; Tue, 11 Apr 2023 19:25:01 +0200 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 1pmHjn-00AYPv-4r; Tue, 11 Apr 2023 19:24:59 +0200 Received: from ore by dude04.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pmHjm-00CbE7-8O; Tue, 11 Apr 2023 19:24:58 +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 Subject: [PATCH net-next v1 1/2] net: dsa: microchip: rework ksz_prmw8 Date: Tue, 11 Apr 2023 19:24:54 +0200 Message-Id: <20230411172456.3003003-2-o.rempel@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230411172456.3003003-1-o.rempel@pengutronix.de> References: <20230411172456.3003003-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=-2.3 required=5.0 tests=RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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?1762902187682568765?= X-GMAIL-MSGID: =?utf-8?q?1762902187682568765?= This patch modifies the ksz_prmw8() function in the ksz_common.h file to return the error value and reuse already existing ksz_rmw8() function. Signed-off-by: Oleksij Rempel --- drivers/net/dsa/microchip/ksz_common.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h index 8abecaf6089e..69c9a19aa4c3 100644 --- a/drivers/net/dsa/microchip/ksz_common.h +++ b/drivers/net/dsa/microchip/ksz_common.h @@ -549,12 +549,11 @@ static inline int ksz_pwrite32(struct ksz_device *dev, int port, int offset, data); } -static inline void ksz_prmw8(struct ksz_device *dev, int port, int offset, +static inline int ksz_prmw8(struct ksz_device *dev, int port, int offset, u8 mask, u8 val) { - regmap_update_bits(dev->regmap[0], - dev->dev_ops->get_port_addr(port, offset), - mask, val); + return ksz_rmw8(dev, dev->dev_ops->get_port_addr(port, offset), mask, + val); } static inline void ksz_regmap_lock(void *__mtx)