linux-kernel - [PATCH next] phy: renesas: rcar-gen3-usb2: Drop local devm_mux_state_get

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <67c8c4f9bf9f09fd0c13daedef27b82ff389ddfb.1770720452.git.geert+renesas@glider.be>
Date: Tue, 10 Feb 2026 11:53:00 +0100
From: Geert Uytterhoeven <geert+renesas@...der.be>
To: Yoshihiro Shimoda <yoshihiro.shimoda.uh@...esas.com>,
	Vinod Koul <vkoul@...nel.org>,
	Neil Armstrong <neil.armstrong@...aro.org>,
	Josua Mayer <josua@...id-run.com>,
	Ulf Hansson <ulf.hansson@...aro.org>,
	Wolfram Sang <wsa+renesas@...g-engineering.com>,
	Tommaso Merciai <tommaso.merciai.xr@...renesas.com>
Cc: linux-phy@...ts.infradead.org,
	linux-mmc@...r.kernel.org,
	linux-renesas-soc@...r.kernel.org,
	linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Geert Uytterhoeven <geert+renesas@...der.be>
Subject: [PATCH next] phy: renesas: rcar-gen3-usb2: Drop local devm_mux_state_get_optional()

Now the mux core provides devm_mux_state_get_optional():

    drivers/phy/renesas/phy-rcar-gen3-usb2.c:944:1: error: static declaration of ‘devm_mux_state_get_optional’ follows non-static
     declaration
      944 | devm_mux_state_get_optional(struct device *dev, const char *mux_name)
	  | ^~~~~~~~~~~~~~~~~~~~~~~~~~~
    In file included from drivers/phy/renesas/phy-rcar-gen3-usb2.c:20:
    include/linux/mux/consumer.h:64:19: note: previous declaration of ‘devm_mux_state_get_optional’ with type ‘struct mux_state *(struct device *, const char *)’
       64 | struct mux_state *devm_mux_state_get_optional(struct device *dev, const char *mux_name);
	  |                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~

Fix this by dropping the temporary local wrapper.

Fixes: ad314348ceb4fe1f ("mux: Add helper functions for getting optional and selected mux-state")
Fixes: 8bb92fd7a0407792 ("phy: renesas: rcar-gen3-usb2: Use mux-state for phyrst management")
Signed-off-by: Geert Uytterhoeven <geert+renesas@...der.be>
---
  - ad314348ceb4fe1f is in mmc/next, and a PR has already been sent
    https://lore.kernel.org/20260209133441.556464-1-ulf.hansson@linaro.org
  - 8bb92fd7a0407792 is in phy/next
---
 drivers/phy/renesas/phy-rcar-gen3-usb2.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/drivers/phy/renesas/phy-rcar-gen3-usb2.c b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
index cfc2a8d9028d58d0..65cbf330bd8fa10c 100644
--- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c
+++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
@@ -939,16 +939,6 @@ static int rcar_gen3_phy_usb2_vbus_regulator_register(struct rcar_gen3_chan *cha
 	return rcar_gen3_phy_usb2_vbus_regulator_get_exclusive_enable(channel, enable);
 }
 
-/* Temporary wrapper until the multiplexer subsystem supports optional muxes */
-static inline struct mux_state *
-devm_mux_state_get_optional(struct device *dev, const char *mux_name)
-{
-	if (!of_property_present(dev->of_node, "mux-states"))
-		return NULL;
-
-	return devm_mux_state_get(dev, mux_name);
-}
-
 static void rcar_gen3_phy_mux_state_deselect(void *data)
 {
 	mux_state_deselect(data);
-- 
2.43.0