From nobody Thu Apr 2 14:10:38 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0491117ADE0; Tue, 10 Feb 2026 10:53:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770720792; cv=none; b=nRv/7v2f4hGmf1AEy/XQpmCjzQl0W6za0azH1FSA3Gb1c0aMEqQDO3piA+58AsMCzC2CUbhiNZDLRmSo9AG+7N6Y5dlNgyz91JhVW+1XWb64gtzteup1/uaiLD2cmM8ILEE/cjNtkw6nBb1zY8x7hdbkPAmV6dTttTON8VPoMjE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770720792; c=relaxed/simple; bh=DdH9HV/drzVjOipT+cCCruo3aAqMdLhSXoBDSWowyEM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=gj46GVE9Xu+ZuA4u37F5X0gCW+DghkDh+iPkwWiviqpmrRkKRj43UCqK5HWkm2wkIWW5eAyc5LgVZaOqG5r0cgU/dbcglywId/yE1pEN/2ycio9GYY5tJmmuyhzx0qGma8YW2BJKP7jn5HGa8yLb1vvP2zcirONsllcj2uQSN/U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id D2888C116C6; Tue, 10 Feb 2026 10:53:08 +0000 (UTC) From: Geert Uytterhoeven To: Yoshihiro Shimoda , Vinod Koul , Neil Armstrong , Josua Mayer , Ulf Hansson , Wolfram Sang , Tommaso Merciai Cc: linux-phy@lists.infradead.org, linux-mmc@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH next] phy: renesas: rcar-gen3-usb2: Drop local devm_mux_state_get_optional() Date: Tue, 10 Feb 2026 11:53:00 +0100 Message-ID: <67c8c4f9bf9f09fd0c13daedef27b82ff389ddfb.1770720452.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Now the mux core provides devm_mux_state_get_optional(): drivers/phy/renesas/phy-rcar-gen3-usb2.c:944:1: error: static declarati= on of =E2=80=98devm_mux_state_get_optional=E2=80=99 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 =E2= =80=98devm_mux_state_get_optional=E2=80=99 with type =E2=80=98struct mux_st= ate *(struct device *, const char *)=E2=80=99 64 | struct mux_state *devm_mux_state_get_optional(struct device *de= v, const char *mux_name); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ Fix this by dropping the temporary local wrapper. Fixes: ad314348ceb4fe1f ("mux: Add helper functions for getting optional an= d selected mux-state") Fixes: 8bb92fd7a0407792 ("phy: renesas: rcar-gen3-usb2: Use mux-state for p= hyrst management") Signed-off-by: Geert Uytterhoeven Reviewed-by: Tommaso Merciai Tested-by: Tommaso Merciai --- - 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, en= able); } =20 -/* Temporary wrapper until the multiplexer subsystem supports optional mux= es */ -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); --=20 2.43.0