public inbox for linux-mmc@vger.kernel.org
 help / color / mirror / Atom feed
From: Josua Mayer <josua@solid-run.com>
To: Marc Kleine-Budde <mkl@pengutronix.de>,
	 Vincent Mailhol <mailhol@kernel.org>,
	Vinod Koul <vkoul@kernel.org>,
	 Neil Armstrong <neil.armstrong@linaro.org>,
	Peter Rosin <peda@axentia.se>,
	 Aaro Koskinen <aaro.koskinen@iki.fi>,
	 Andreas Kemnade <andreas@kemnade.info>,
	Kevin Hilman <khilman@baylibre.com>,
	 Roger Quadros <rogerq@kernel.org>,
	Tony Lindgren <tony@atomide.com>,
	 Janusz Krzysztofik <jmkrzyszt@gmail.com>,
	Vignesh R <vigneshr@ti.com>,  Andi Shyti <andi.shyti@kernel.org>,
	Ulf Hansson <ulf.hansson@linaro.org>,
	 Rob Herring <robh@kernel.org>,
	Krzysztof Kozlowski <krzk+dt@kernel.org>,
	 Conor Dooley <conor+dt@kernel.org>,
	 Geert Uytterhoeven <geert+renesas@glider.be>,
	 Magnus Damm <magnus.damm@gmail.com>,
	 Wolfram Sang <wsa+renesas@sang-engineering.com>,
	 Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Cc: Yazan Shhady <yazan.shhady@solid-run.com>,
	 Jon Nettleton <jon@solid-run.com>,
	Vladimir Oltean <olteanv@gmail.com>,
	 Mikhail Anikin <mikhail.anikin@solid-run.com>,
	linux-can@vger.kernel.org,  linux-phy@lists.infradead.org,
	linux-kernel@vger.kernel.org,  linux-omap@vger.kernel.org,
	linux-i2c@vger.kernel.org,  linux-mmc@vger.kernel.org,
	devicetree@vger.kernel.org,  linux-renesas-soc@vger.kernel.org,
	Josua Mayer <josua@solid-run.com>
Subject: [PATCH v10 2/9] phy: renesas: rcar-gen3-usb2: rename local mux helper to avoid conflict
Date: Wed, 25 Feb 2026 13:34:16 +0200	[thread overview]
Message-ID: <20260225-rz-sdio-mux-v10-2-1ee44f2ea112@solid-run.com> (raw)
In-Reply-To: <20260225-rz-sdio-mux-v10-0-1ee44f2ea112@solid-run.com>

Rename the temporary devm_mux_state_get_optional function to avoid
conflict with upcoming implementation in multiplexer subsystem.

Signed-off-by: Josua Mayer <josua@solid-run.com>
---
 drivers/phy/renesas/phy-rcar-gen3-usb2.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/phy/renesas/phy-rcar-gen3-usb2.c b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
index cfc2a8d9028d..1155b111420a 100644
--- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c
+++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
@@ -941,7 +941,7 @@ static int rcar_gen3_phy_usb2_vbus_regulator_register(struct rcar_gen3_chan *cha
 
 /* 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)
+rcar_gen3_phy_mux_state_get_optional(struct device *dev, const char *mux_name)
 {
 	if (!of_property_present(dev->of_node, "mux-states"))
 		return NULL;
@@ -1036,7 +1036,7 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
 		phy_set_drvdata(channel->rphys[i].phy, &channel->rphys[i]);
 	}
 
-	mux_state = devm_mux_state_get_optional(dev, NULL);
+	mux_state = rcar_gen3_phy_mux_state_get_optional(dev, NULL);
 	if (IS_ERR(mux_state))
 		return PTR_ERR(mux_state);
 	if (mux_state) {

-- 
2.43.0


  parent reply	other threads:[~2026-02-25 11:34 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-02-25 11:34 [PATCH v10 0/9] mmc: host: renesas_sdhi_core: support configuring an optional sdio mux Josua Mayer
2026-02-25 11:34 ` [PATCH v10 1/9] phy: can-transceiver: rename temporary helper function to avoid conflict Josua Mayer
2026-02-25 11:34 ` Josua Mayer [this message]
2026-02-25 11:34 ` [PATCH v10 3/9] mux: Add helper functions for getting optional and selected mux-state Josua Mayer
2026-02-26 10:46   ` Josua Mayer
2026-02-25 11:34 ` [PATCH v10 4/9] phy: can-transceiver: drop temporary helper getting optional mux-state Josua Mayer
2026-02-25 11:34 ` [PATCH v10 5/9] phy: renesas: rcar-gen3-usb2: drop " Josua Mayer
2026-02-25 11:34 ` [PATCH v10 6/9] i2c: omap: switch to new generic helper for getting selected mux-state Josua Mayer
2026-02-25 11:34 ` [PATCH v10 7/9] dt-bindings: mmc: renesas,sdhi: Add mux-states property Josua Mayer
2026-02-25 11:34 ` [PATCH v10 8/9] mux: add prompt and help text to CONFIG_MULTIPLEXER making it visible Josua Mayer
2026-02-25 12:07   ` Geert Uytterhoeven
2026-02-26 13:19     ` Josua Mayer
2026-02-25 12:24   ` Ulf Hansson
2026-02-26  9:49     ` Josua Mayer
2026-02-25 11:34 ` [PATCH v10 9/9] mmc: host: renesas_sdhi_core: support selecting an optional mux Josua Mayer
2026-02-25 12:14 ` [PATCH v10 0/9] mmc: host: renesas_sdhi_core: support configuring an optional sdio mux Josua Mayer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260225-rz-sdio-mux-v10-2-1ee44f2ea112@solid-run.com \
    --to=josua@solid-run.com \
    --cc=aaro.koskinen@iki.fi \
    --cc=andi.shyti@kernel.org \
    --cc=andreas@kemnade.info \
    --cc=conor+dt@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=geert+renesas@glider.be \
    --cc=jmkrzyszt@gmail.com \
    --cc=jon@solid-run.com \
    --cc=khilman@baylibre.com \
    --cc=krzk+dt@kernel.org \
    --cc=linux-can@vger.kernel.org \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux-phy@lists.infradead.org \
    --cc=linux-renesas-soc@vger.kernel.org \
    --cc=magnus.damm@gmail.com \
    --cc=mailhol@kernel.org \
    --cc=mikhail.anikin@solid-run.com \
    --cc=mkl@pengutronix.de \
    --cc=neil.armstrong@linaro.org \
    --cc=olteanv@gmail.com \
    --cc=peda@axentia.se \
    --cc=robh@kernel.org \
    --cc=rogerq@kernel.org \
    --cc=tony@atomide.com \
    --cc=ulf.hansson@linaro.org \
    --cc=vigneshr@ti.com \
    --cc=vkoul@kernel.org \
    --cc=wsa+renesas@sang-engineering.com \
    --cc=yazan.shhady@solid-run.com \
    --cc=yoshihiro.shimoda.uh@renesas.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox