From nobody Wed Sep 10 08:48:10 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30D80C77B75 for ; Mon, 22 May 2023 11:33:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233026AbjEVLdD (ORCPT ); Mon, 22 May 2023 07:33:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232859AbjEVLcv (ORCPT ); Mon, 22 May 2023 07:32:51 -0400 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B308ABB; Mon, 22 May 2023 04:32:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1684755160; x=1716291160; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=GsuBZcasl8sgSNzixS2gOiiY1ioqkDcpYlCuGBXnRyo=; b=gqX0EBpvEuRToAmejaYPMixciBJJEO0ufMqXgcnVMDT5yVgUyrNz+PG+ MqRVeFfBGmVxBsJ1QecsfiFcMdJAEYcXSxzqEywyi28XDTc0U5fhq0yOL ci0xsYjdm7/SU3KAjSuZ3R7Dnu0zxH+8oWRrI2i0R2m2Smljjj/PYHMy5 xlFlTeLmUwa0RwV08Knxym/G8W6cxFjl5HyqPv78byn42fIPF/QvEHGwx qoq3r1H6JvZ5olnf6mnvxbk56xrPykkHFXuetDTSqHY6vKuUDZsr4BOmx u3ZP4b8qUu/duNlcjTizHJEIILDehQHTpRkag94lrYJjFCr60c0nVgQAX Q==; X-IronPort-AV: E=Sophos;i="6.00,184,1681196400"; d="scan'208";a="153287684" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa6.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 22 May 2023 04:32:39 -0700 Received: from chn-vm-ex01.mchp-main.com (10.10.85.143) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Mon, 22 May 2023 04:32:38 -0700 Received: from CHE-LT-I17164LX.microchip.com (10.10.115.15) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server id 15.1.2507.21 via Frontend Transport; Mon, 22 May 2023 04:32:33 -0700 From: Parthiban Veerasooran To: , , , , , , , , , CC: , , , , "Parthiban Veerasooran" Subject: [PATCH net-next v2 2/6] net: phy: microchip_t1s: replace read-modify-write code with phy_modify_mmd Date: Mon, 22 May 2023 17:03:27 +0530 Message-ID: <20230522113331.36872-3-Parthiban.Veerasooran@microchip.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230522113331.36872-1-Parthiban.Veerasooran@microchip.com> References: <20230522113331.36872-1-Parthiban.Veerasooran@microchip.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Replace read-modify-write code in the lan867x_config_init function to avoid handling data type mismatch and to simplify the code. Signed-off-by: Parthiban Veerasooran --- drivers/net/phy/microchip_t1s.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/drivers/net/phy/microchip_t1s.c b/drivers/net/phy/microchip_t1= s.c index a42a6bb6e3bd..534d9faf8475 100644 --- a/drivers/net/phy/microchip_t1s.c +++ b/drivers/net/phy/microchip_t1s.c @@ -31,19 +31,19 @@ * W 0x1F 0x0099 0x7F80 ------ */ =20 -static const int lan867x_fixup_registers[12] =3D { +static const u32 lan867x_fixup_registers[12] =3D { 0x00D0, 0x00D1, 0x0084, 0x0085, 0x008A, 0x0087, 0x0088, 0x008B, 0x0080, 0x00F1, 0x0096, 0x0099, }; =20 -static const int lan867x_fixup_values[12] =3D { +static const u16 lan867x_fixup_values[12] =3D { 0x0002, 0x0000, 0x3380, 0x0006, 0xC000, 0x801C, 0x033F, 0x0404, 0x0600, 0x2400, 0x2000, 0x7F80, }; =20 -static const int lan867x_fixup_masks[12] =3D { +static const u16 lan867x_fixup_masks[12] =3D { 0x0E03, 0x0300, 0xFFC0, 0x000F, 0xF800, 0x801C, 0x1FFF, 0xFFFF, 0x0600, 0x7F00, 0x2000, 0xFFFF, @@ -63,9 +63,7 @@ static int lan867x_config_init(struct phy_device *phydev) * used, which might then write the same value back as read + modified. */ =20 - int reg_value; int err; - int reg; =20 /* Read-Modified Write Pseudocode (from AN1699) * current_val =3D read_register(mmd, addr) // Read current register value @@ -74,12 +72,11 @@ static int lan867x_config_init(struct phy_device *phyde= v) * write_register(mmd, addr, new_val) // Write back updated register value */ for (int i =3D 0; i < ARRAY_SIZE(lan867x_fixup_registers); i++) { - reg =3D lan867x_fixup_registers[i]; - reg_value =3D phy_read_mmd(phydev, MDIO_MMD_VEND2, reg); - reg_value &=3D ~lan867x_fixup_masks[i]; - reg_value |=3D lan867x_fixup_values[i]; - err =3D phy_write_mmd(phydev, MDIO_MMD_VEND2, reg, reg_value); - if (err !=3D 0) + err =3D phy_modify_mmd(phydev, MDIO_MMD_VEND2, + lan867x_fixup_registers[i], + lan867x_fixup_masks[i], + lan867x_fixup_values[i]); + if (err) return err; } =20 --=20 2.34.1