Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp7678788rwd; Tue, 20 Jun 2023 04:56:54 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4ffV9Y5r6IX7BPgFAlkutmzHS1KRuNh79hRQD0yNPrkBcd07muBk1Gt5W4vBxEIgEC6DAv X-Received: by 2002:a05:6808:2a55:b0:39e:c4d7:655c with SMTP id fa21-20020a0568082a5500b0039ec4d7655cmr8819755oib.4.1687262214169; Tue, 20 Jun 2023 04:56:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687262214; cv=none; d=google.com; s=arc-20160816; b=OQF+BTyZddwcoOKcNvmaN2WzSUTBhTfNkM4KRchKsHSfRSPZ3S2do1YI5Oki3kR3J0 +SS0mbcOdrU9SqGC1H38jWyUa7RSpa/g1vQ8mICiZ+kUMUZry7p7eiwoAShy+TLpqpkV 58crpMpmoKs6JjA9MXKa0lWmLH2D9rw0BzJ8FS9YDEdKQJlONobt/dshtrbytuh7vWR/ aOGxN/OWZyuD6+aAvr9oURvReN8p0YOiQ83l71BsE3YeMTjnYmCsQ2Px8wBqw6BS/iyK 5oE3wJHPlWPHF5Q/ZDc8IXfNyf46Gb6rTUApAuGcs5U6a6JrBkZbKUCfeO8TceDwbIuY Rqpg== 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 :dkim-signature; bh=ZNFZpEh4/cl7s83JmJ5khDQ6aml5OmK6AW+M363aFjU=; b=aWf/nDUEw+xyW8dz0m6GhVHa6voJldjsaKUeo66aERPS1Wvd2vhrzWEppCjwuB8b1I EzI2iHmcz6ufMrfPfpFdJYiN48x55VsITYxr7RErGmg8+kVIPzOFbU8LnfhYKroRxCE/ 3faqQmtFvznYUo22DBFGNGYrzCCLhTtHU3kfKghVvhf+8FQPJMXkYKfCVbq/BE6TAcsN hI2XCJ3XNf+TefNY3t5RcymPNNhEMdN4teGN8LHPIJInepAmrRt/aCPZktwHMaZalwWe YiVnSlVq2luVJHHJfV9xz+kjvG5AqfgoDW5HpSdqnwlgHSO8ZldO8x7Au24Bz9O+vaBx l10w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@rasmusvillemoes.dk header.s=google header.b=biDDrOKT; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kb8-20020a17090ae7c800b0025efb838ac0si1946523pjb.179.2023.06.20.04.56.40; Tue, 20 Jun 2023 04:56:54 -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; dkim=pass header.i=@rasmusvillemoes.dk header.s=google header.b=biDDrOKT; 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 S231888AbjFTLlB (ORCPT + 99 others); Tue, 20 Jun 2023 07:41:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229933AbjFTLk7 (ORCPT ); Tue, 20 Jun 2023 07:40:59 -0400 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF654A1 for ; Tue, 20 Jun 2023 04:40:58 -0700 (PDT) Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-4f85966b0f2so5369591e87.3 for ; Tue, 20 Jun 2023 04:40:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rasmusvillemoes.dk; s=google; t=1687261257; x=1689853257; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZNFZpEh4/cl7s83JmJ5khDQ6aml5OmK6AW+M363aFjU=; b=biDDrOKTzHLYitPYod0RIO44Z1JCB7Vq+G/s+gIYRJ2XB3b8jr5tsk0/Ye8+Kzh0LE Eh+8lJrPZvu97GzuuyWh78xXH1gh8GVwXM9ymXeSG3xrnPYwkR20MrEBXlcBtDrp2gUD pmxc6LeLO/SoMTCZtrJz2gDxUEYFN7NpO4t9Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687261257; x=1689853257; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZNFZpEh4/cl7s83JmJ5khDQ6aml5OmK6AW+M363aFjU=; b=bmH+bsOE1f2i8p55AqRn9/w7xdPWgByvGIUACAhccJ41WVNTU/tNH9n3nD461VjAey c8imF1x6uASA+ML6otHxHPSKL4KGwcOOCCO6tZWASBzwdK4dGJTzALDIcNiAdD6ykqxN 4QBoULWEZl4yoTHOnOWNZAtsDXXGDfq6vQzvrwe/xyvAAUGvwEnwG2dCwPhjEWbWaYZy Zus40OeaIL2V6vRVrmeCHrvGmrlbC7hQV/UAE50fim6mZkKJhAh9DEIZR0qyzdmGhtkv 4vGbRsvgjSS2whLVAXXP8UF2pr0QwSP4LT2W2E+LdGv6Zs3CuyMeN4+sAIZgP6gS6vdv EdcA== X-Gm-Message-State: AC+VfDy7ev67MsaD4+BfqO/VXWgbH7R/8p3Fw4PpFLfOmCbsh1k1yfRy 8cOVkD9sN8Jhz2YIALPZHg1tZvuyNjmP30lxhh37ig== X-Received: by 2002:a05:6512:3284:b0:4f8:692a:6492 with SMTP id p4-20020a056512328400b004f8692a6492mr4413487lfe.32.1687261256749; Tue, 20 Jun 2023 04:40:56 -0700 (PDT) Received: from localhost.localdomain ([87.54.42.112]) by smtp.gmail.com with ESMTPSA id d12-20020ac2544c000000b004f84162e08bsm329879lfn.185.2023.06.20.04.40.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 04:40:56 -0700 (PDT) From: Rasmus Villemoes To: Woojung Huh , UNGLinuxDriver@microchip.com, Andrew Lunn , Florian Fainelli , Vladimir Oltean , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Rasmus Villemoes , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 1/3] net: dsa: microchip: simplify ksz_prmw8() Date: Tue, 20 Jun 2023 13:38:52 +0200 Message-Id: <20230620113855.733526-2-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230620113855.733526-1-linux@rasmusvillemoes.dk> References: <20230620113855.733526-1-linux@rasmusvillemoes.dk> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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 Implement ksz_prmw8() in terms of ksz_rmw8(), just as all the other ksz_pX are implemented in terms of ksz_X. No functional change. Signed-off-by: Rasmus Villemoes --- drivers/net/dsa/microchip/ksz_common.h | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/net/dsa/microchip/ksz_common.h b/drivers/net/dsa/microchip/ksz_common.h index a66b56857ec6..2453c43c48a5 100644 --- a/drivers/net/dsa/microchip/ksz_common.h +++ b/drivers/net/dsa/microchip/ksz_common.h @@ -578,17 +578,8 @@ static inline int ksz_pwrite32(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) { - int ret; - - ret = regmap_update_bits(ksz_regmap_8(dev), - dev->dev_ops->get_port_addr(port, offset), - mask, val); - if (ret) - dev_err(dev->dev, "can't rmw 8bit reg 0x%x: %pe\n", - dev->dev_ops->get_port_addr(port, offset), - ERR_PTR(ret)); - - return ret; + return ksz_rmw8(dev, dev->dev_ops->get_port_addr(port, offset), + mask, val); } static inline void ksz_regmap_lock(void *__mtx) -- 2.37.2