Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Peter Chen <peter.chen@nxp.com>
To:     Heikki Krogerus <heikki.krogerus@linux.intel.com>
CC:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Benson Leung <bleung@chromium.org>,
        Prashant Malani <pmalani@chromium.org>,
        Mika Westerberg <mika.westerberg@linux.intel.com>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>,
        Felipe Balbi <balbi@kernel.org>,
        Chunfeng Yun <chunfeng.yun@mediatek.com>,
        Bin Liu <b-liu@ti.com>
Subject: Re: [PATCH v2 5/9] usb: roles: Provide the switch drivers handle to
 the switch in the API
Thread-Topic: [PATCH v2 5/9] usb: roles: Provide the switch drivers handle to
 the switch in the API
Thread-Index: AQHV6wvzIyZpbIaiske1bsSyj2bnlKgqUqgA
Date:   Mon, 24 Feb 2020 13:14:40 +0000
Message-ID: <20200224131442.GA5365@b29397-desktop>
References: <20200224121406.2419-1-heikki.krogerus@linux.intel.com>
 <20200224121406.2419-6-heikki.krogerus@linux.intel.com>
In-Reply-To: <20200224121406.2419-6-heikki.krogerus@linux.intel.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: nxp.com does not designate
 permitted sender hosts)
Content-Type: text/plain; charset="us-ascii"
Content-ID: <171409410E53E5428D0AC26E8167587E@eurprd04.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: ba2c4940-6d60-47ea-f22a-08d7b92b81de
X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Feb 2020 13:14:40.8669
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: VyqpCTp8JvfR6So28n3d29l35vqmPlqJgIfNAL5NigI5FUuALzamta8zbLOHwlWR3f4xlcbniYA+WG+1eVGgeg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5391
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 20-02-24 15:14:02, Heikki Krogerus wrote:
> The USB role callback functions had a parameter pointing to
> the parent device (struct device) of the switch. The
> assumption was that the switch parent is always the
> controller. Firstly, that may not be true in every case, and
> secondly, it prevents us from supporting devices that supply
> multiple muxes.
>=20
> Changing the first parameter of usb_role_switch_set_t and
> usb_role_switch_get_t from struct device to struct
> usb_role_switch.
>=20
> Cc: Peter Chen <Peter.Chen@nxp.com>
> Cc: Felipe Balbi <balbi@kernel.org>
> Cc: Chunfeng Yun <chunfeng.yun@mediatek.com>
> Cc: Bin Liu <b-liu@ti.com>

For chipidea and cdns3 changes:
Acked-by: Peter Chen <peter.chen@nxp.com>

Peter

> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> ---
>  drivers/usb/cdns3/core.c                      | 22 ++++++++--------
>  drivers/usb/chipidea/core.c                   | 10 ++++---
>  drivers/usb/dwc3/dwc3-meson-g12a.c            | 10 ++++---
>  drivers/usb/gadget/udc/renesas_usb3.c         | 26 ++++++++++---------
>  drivers/usb/gadget/udc/tegra-xudc.c           |  8 +++---
>  drivers/usb/mtu3/mtu3_dr.c                    |  9 ++++---
>  drivers/usb/musb/mediatek.c                   | 16 +++++++-----
>  drivers/usb/roles/class.c                     |  4 +--
>  .../usb/roles/intel-xhci-usb-role-switch.c    | 26 +++++++++++--------
>  include/linux/usb/role.h                      |  5 ++--
>  10 files changed, 77 insertions(+), 59 deletions(-)
>=20
> diff --git a/drivers/usb/cdns3/core.c b/drivers/usb/cdns3/core.c
> index c2123ef8d8a3..82af9d2b33b9 100644
> --- a/drivers/usb/cdns3/core.c
> +++ b/drivers/usb/cdns3/core.c
> @@ -330,9 +330,9 @@ int cdns3_hw_role_switch(struct cdns3 *cdns)
>   *
>   * Returns role
>   */
> -static enum usb_role cdns3_role_get(struct device *dev)
> +static enum usb_role cdns3_role_get(struct usb_role_switch *sw)
>  {
> -	struct cdns3 *cdns =3D dev_get_drvdata(dev);
> +	struct cdns3 *cdns =3D usb_role_switch_get_drvdata(sw);
> =20
>  	return cdns->role;
>  }
> @@ -346,9 +346,9 @@ static enum usb_role cdns3_role_get(struct device *de=
v)
>   * - Role switch for dual-role devices
>   * - USB_ROLE_GADGET <--> USB_ROLE_NONE for peripheral-only devices
>   */
> -static int cdns3_role_set(struct device *dev, enum usb_role role)
> +static int cdns3_role_set(struct usb_role_switch *sw, enum usb_role role=
)
>  {
> -	struct cdns3 *cdns =3D dev_get_drvdata(dev);
> +	struct cdns3 *cdns =3D usb_role_switch_get_drvdata(sw);
>  	int ret =3D 0;
> =20
>  	pm_runtime_get_sync(cdns->dev);
> @@ -423,12 +423,6 @@ static int cdns3_role_set(struct device *dev, enum u=
sb_role role)
>  	return ret;
>  }
> =20
> -static const struct usb_role_switch_desc cdns3_switch_desc =3D {
> -	.set =3D cdns3_role_set,
> -	.get =3D cdns3_role_get,
> -	.allow_userspace_control =3D true,
> -};
> -
>  /**
>   * cdns3_probe - probe for cdns3 core device
>   * @pdev: Pointer to cdns3 core platform device
> @@ -437,6 +431,7 @@ static const struct usb_role_switch_desc cdns3_switch=
_desc =3D {
>   */
>  static int cdns3_probe(struct platform_device *pdev)
>  {
> +	struct usb_role_switch_desc sw_desc =3D { };
>  	struct device *dev =3D &pdev->dev;
>  	struct resource	*res;
>  	struct cdns3 *cdns;
> @@ -529,7 +524,12 @@ static int cdns3_probe(struct platform_device *pdev)
>  	if (ret)
>  		goto err3;
> =20
> -	cdns->role_sw =3D usb_role_switch_register(dev, &cdns3_switch_desc);
> +	sw_desc.set =3D cdns3_role_set,
> +	sw_desc.get =3D cdns3_role_get,
> +	sw_desc.allow_userspace_control =3D true,
> +	sw_desc.driver_data =3D cdns;
> +
> +	cdns->role_sw =3D usb_role_switch_register(dev, &sw_desc);
>  	if (IS_ERR(cdns->role_sw)) {
>  		ret =3D PTR_ERR(cdns->role_sw);
>  		dev_warn(dev, "Unable to register Role Switch\n");
> diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
> index 52139c2a9924..ae0bdc036464 100644
> --- a/drivers/usb/chipidea/core.c
> +++ b/drivers/usb/chipidea/core.c
> @@ -600,9 +600,9 @@ static int ci_cable_notifier(struct notifier_block *n=
b, unsigned long event,
>  	return NOTIFY_DONE;
>  }
> =20
> -static enum usb_role ci_usb_role_switch_get(struct device *dev)
> +static enum usb_role ci_usb_role_switch_get(struct usb_role_switch *sw)
>  {
> -	struct ci_hdrc *ci =3D dev_get_drvdata(dev);
> +	struct ci_hdrc *ci =3D usb_role_switch_get_drvdata(sw);
>  	enum usb_role role;
>  	unsigned long flags;
> =20
> @@ -613,9 +613,10 @@ static enum usb_role ci_usb_role_switch_get(struct d=
evice *dev)
>  	return role;
>  }
> =20
> -static int ci_usb_role_switch_set(struct device *dev, enum usb_role role=
)
> +static int ci_usb_role_switch_set(struct usb_role_switch *sw,
> +				  enum usb_role role)
>  {
> -	struct ci_hdrc *ci =3D dev_get_drvdata(dev);
> +	struct ci_hdrc *ci =3D usb_role_switch_get_drvdata(sw);
>  	struct ci_hdrc_cable *cable =3D NULL;
>  	enum usb_role current_role =3D ci_role_to_usb_role(ci);
>  	enum ci_role ci_role =3D usb_role_to_ci_role(role);
> @@ -1118,6 +1119,7 @@ static int ci_hdrc_probe(struct platform_device *pd=
ev)
>  	}
> =20
>  	if (ci_role_switch.fwnode) {
> +		ci_role_switch.driver_data =3D ci;
>  		ci->role_switch =3D usb_role_switch_register(dev,
>  					&ci_role_switch);
>  		if (IS_ERR(ci->role_switch)) {
> diff --git a/drivers/usb/dwc3/dwc3-meson-g12a.c b/drivers/usb/dwc3/dwc3-m=
eson-g12a.c
> index 8a3ec1a951fe..3309ce90ca14 100644
> --- a/drivers/usb/dwc3/dwc3-meson-g12a.c
> +++ b/drivers/usb/dwc3/dwc3-meson-g12a.c
> @@ -321,9 +321,10 @@ static int dwc3_meson_g12a_otg_mode_set(struct dwc3_=
meson_g12a *priv,
>  	return 0;
>  }
> =20
> -static int dwc3_meson_g12a_role_set(struct device *dev, enum usb_role ro=
le)
> +static int dwc3_meson_g12a_role_set(struct usb_role_switch *sw,
> +				    enum usb_role role)
>  {
> -	struct dwc3_meson_g12a *priv =3D dev_get_drvdata(dev);
> +	struct dwc3_meson_g12a *priv =3D usb_role_switch_get_drvdata(sw);
>  	enum phy_mode mode;
> =20
>  	if (role =3D=3D USB_ROLE_NONE)
> @@ -338,9 +339,9 @@ static int dwc3_meson_g12a_role_set(struct device *de=
v, enum usb_role role)
>  	return dwc3_meson_g12a_otg_mode_set(priv, mode);
>  }
> =20
> -static enum usb_role dwc3_meson_g12a_role_get(struct device *dev)
> +static enum usb_role dwc3_meson_g12a_role_get(struct usb_role_switch *sw=
)
>  {
> -	struct dwc3_meson_g12a *priv =3D dev_get_drvdata(dev);
> +	struct dwc3_meson_g12a *priv =3D usb_role_switch_get_drvdata(sw);
> =20
>  	return priv->otg_phy_mode =3D=3D PHY_MODE_USB_HOST ?
>  		USB_ROLE_HOST : USB_ROLE_DEVICE;
> @@ -499,6 +500,7 @@ static int dwc3_meson_g12a_probe(struct platform_devi=
ce *pdev)
>  	priv->switch_desc.allow_userspace_control =3D true;
>  	priv->switch_desc.set =3D dwc3_meson_g12a_role_set;
>  	priv->switch_desc.get =3D dwc3_meson_g12a_role_get;
> +	priv->switch_desc.driver_data =3D priv;
> =20
>  	priv->role_switch =3D usb_role_switch_register(dev, &priv->switch_desc)=
;
>  	if (IS_ERR(priv->role_switch))
> diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/u=
dc/renesas_usb3.c
> index c5c3c14df67a..4da90160b400 100644
> --- a/drivers/usb/gadget/udc/renesas_usb3.c
> +++ b/drivers/usb/gadget/udc/renesas_usb3.c
> @@ -2355,14 +2355,14 @@ static const struct usb_gadget_ops renesas_usb3_g=
adget_ops =3D {
>  	.set_selfpowered	=3D renesas_usb3_set_selfpowered,
>  };
> =20
> -static enum usb_role renesas_usb3_role_switch_get(struct device *dev)
> +static enum usb_role renesas_usb3_role_switch_get(struct usb_role_switch=
 *sw)
>  {
> -	struct renesas_usb3 *usb3 =3D dev_get_drvdata(dev);
> +	struct renesas_usb3 *usb3 =3D usb_role_switch_get_drvdata(sw);
>  	enum usb_role cur_role;
> =20
> -	pm_runtime_get_sync(dev);
> +	pm_runtime_get_sync(usb3_to_dev(usb3));
>  	cur_role =3D usb3_is_host(usb3) ? USB_ROLE_HOST : USB_ROLE_DEVICE;
> -	pm_runtime_put(dev);
> +	pm_runtime_put(usb3_to_dev(usb3));
> =20
>  	return cur_role;
>  }
> @@ -2372,7 +2372,7 @@ static void handle_ext_role_switch_states(struct de=
vice *dev,
>  {
>  	struct renesas_usb3 *usb3 =3D dev_get_drvdata(dev);
>  	struct device *host =3D usb3->host_dev;
> -	enum usb_role cur_role =3D renesas_usb3_role_switch_get(dev);
> +	enum usb_role cur_role =3D renesas_usb3_role_switch_get(usb3->role_sw);
> =20
>  	switch (role) {
>  	case USB_ROLE_NONE:
> @@ -2424,7 +2424,7 @@ static void handle_role_switch_states(struct device=
 *dev,
>  {
>  	struct renesas_usb3 *usb3 =3D dev_get_drvdata(dev);
>  	struct device *host =3D usb3->host_dev;
> -	enum usb_role cur_role =3D renesas_usb3_role_switch_get(dev);
> +	enum usb_role cur_role =3D renesas_usb3_role_switch_get(usb3->role_sw);
> =20
>  	if (cur_role =3D=3D USB_ROLE_HOST && role =3D=3D USB_ROLE_DEVICE) {
>  		device_release_driver(host);
> @@ -2438,19 +2438,19 @@ static void handle_role_switch_states(struct devi=
ce *dev,
>  	}
>  }
> =20
> -static int renesas_usb3_role_switch_set(struct device *dev,
> +static int renesas_usb3_role_switch_set(struct usb_role_switch *sw,
>  					enum usb_role role)
>  {
> -	struct renesas_usb3 *usb3 =3D dev_get_drvdata(dev);
> +	struct renesas_usb3 *usb3 =3D usb_role_switch_get_drvdata(sw);
> =20
> -	pm_runtime_get_sync(dev);
> +	pm_runtime_get_sync(usb3_to_dev(usb3));
> =20
>  	if (usb3->role_sw_by_connector)
> -		handle_ext_role_switch_states(dev, role);
> +		handle_ext_role_switch_states(usb3_to_dev(usb3), role);
>  	else
> -		handle_role_switch_states(dev, role);
> +		handle_role_switch_states(usb3_to_dev(usb3), role);
> =20
> -	pm_runtime_put(dev);
> +	pm_runtime_put(usb3_to_dev(usb3));
> =20
>  	return 0;
>  }
> @@ -2831,6 +2831,8 @@ static int renesas_usb3_probe(struct platform_devic=
e *pdev)
>  		renesas_usb3_role_switch_desc.fwnode =3D dev_fwnode(&pdev->dev);
>  	}
> =20
> +	renesas_usb3_role_switch_desc.driver_data =3D usb3;
> +
>  	INIT_WORK(&usb3->role_work, renesas_usb3_role_work);
>  	usb3->role_sw =3D usb_role_switch_register(&pdev->dev,
>  					&renesas_usb3_role_switch_desc);
> diff --git a/drivers/usb/gadget/udc/tegra-xudc.c b/drivers/usb/gadget/udc=
/tegra-xudc.c
> index 634c2c19a176..b9df6369d56d 100644
> --- a/drivers/usb/gadget/udc/tegra-xudc.c
> +++ b/drivers/usb/gadget/udc/tegra-xudc.c
> @@ -676,12 +676,13 @@ static void tegra_xudc_usb_role_sw_work(struct work=
_struct *work)
> =20
>  }
> =20
> -static int tegra_xudc_usb_role_sw_set(struct device *dev, enum usb_role =
role)
> +static int tegra_xudc_usb_role_sw_set(struct usb_role_switch *sw,
> +				      enum usb_role role)
>  {
> -	struct tegra_xudc *xudc =3D dev_get_drvdata(dev);
> +	struct tegra_xudc *xudc =3D usb_role_switch_get_drvdata(sw);
>  	unsigned long flags;
> =20
> -	dev_dbg(dev, "%s role is %d\n", __func__, role);
> +	dev_dbg(xudc->dev, "%s role is %d\n", __func__, role);
> =20
>  	spin_lock_irqsave(&xudc->lock, flags);
> =20
> @@ -3590,6 +3591,7 @@ static int tegra_xudc_probe(struct platform_device =
*pdev)
>  	if (of_property_read_bool(xudc->dev->of_node, "usb-role-switch")) {
>  		role_sx_desc.set =3D tegra_xudc_usb_role_sw_set;
>  		role_sx_desc.fwnode =3D dev_fwnode(xudc->dev);
> +		role_sx_desc.driver_data =3D xudc;
> =20
>  		xudc->usb_role_sw =3D usb_role_switch_register(xudc->dev,
>  							&role_sx_desc);
> diff --git a/drivers/usb/mtu3/mtu3_dr.c b/drivers/usb/mtu3/mtu3_dr.c
> index 08e18448e8b8..04f666e85731 100644
> --- a/drivers/usb/mtu3/mtu3_dr.c
> +++ b/drivers/usb/mtu3/mtu3_dr.c
> @@ -320,9 +320,9 @@ void ssusb_set_force_mode(struct ssusb_mtk *ssusb,
>  	mtu3_writel(ssusb->ippc_base, SSUSB_U2_CTRL(0), value);
>  }
> =20
> -static int ssusb_role_sw_set(struct device *dev, enum usb_role role)
> +static int ssusb_role_sw_set(struct usb_role_switch *sw, enum usb_role r=
ole)
>  {
> -	struct ssusb_mtk *ssusb =3D dev_get_drvdata(dev);
> +	struct ssusb_mtk *ssusb =3D usb_role_switch_get_drvdata(sw);
>  	bool to_host =3D false;
> =20
>  	if (role =3D=3D USB_ROLE_HOST)
> @@ -334,9 +334,9 @@ static int ssusb_role_sw_set(struct device *dev, enum=
 usb_role role)
>  	return 0;
>  }
> =20
> -static enum usb_role ssusb_role_sw_get(struct device *dev)
> +static enum usb_role ssusb_role_sw_get(struct usb_role_switch *sw)
>  {
> -	struct ssusb_mtk *ssusb =3D dev_get_drvdata(dev);
> +	struct ssusb_mtk *ssusb =3D usb_role_switch_get_drvdata(sw);
>  	enum usb_role role;
> =20
>  	role =3D ssusb->is_host ? USB_ROLE_HOST : USB_ROLE_DEVICE;
> @@ -356,6 +356,7 @@ static int ssusb_role_sw_register(struct otg_switch_m=
tk *otg_sx)
>  	role_sx_desc.set =3D ssusb_role_sw_set;
>  	role_sx_desc.get =3D ssusb_role_sw_get;
>  	role_sx_desc.fwnode =3D dev_fwnode(ssusb->dev);
> +	role_sx_desc.driver_data =3D ssusb;
>  	otg_sx->role_sw =3D usb_role_switch_register(ssusb->dev, &role_sx_desc)=
;
> =20
>  	return PTR_ERR_OR_ZERO(otg_sx->role_sw);
> diff --git a/drivers/usb/musb/mediatek.c b/drivers/usb/musb/mediatek.c
> index 6b88c2f5d970..a627f4133d6b 100644
> --- a/drivers/usb/musb/mediatek.c
> +++ b/drivers/usb/musb/mediatek.c
> @@ -115,9 +115,8 @@ static void mtk_musb_clks_disable(struct mtk_glue *gl=
ue)
>  	clk_disable_unprepare(glue->main);
>  }
> =20
> -static int musb_usb_role_sx_set(struct device *dev, enum usb_role role)
> +static int mtk_otg_switch_set(struct mtk_glue *glue, enum usb_role role)
>  {
> -	struct mtk_glue *glue =3D dev_get_drvdata(dev);
>  	struct musb *musb =3D glue->musb;
>  	u8 devctl =3D readb(musb->mregs + MUSB_DEVCTL);
>  	enum usb_role new_role;
> @@ -168,9 +167,14 @@ static int musb_usb_role_sx_set(struct device *dev, =
enum usb_role role)
>  	return 0;
>  }
> =20
> -static enum usb_role musb_usb_role_sx_get(struct device *dev)
> +static int musb_usb_role_sx_set(struct usb_role_switch *sw, enum usb_rol=
e role)
>  {
> -	struct mtk_glue *glue =3D dev_get_drvdata(dev);
> +	return mtk_otg_switch_set(usb_role_switch_get_drvdata(sw), role);
> +}
> +
> +static enum usb_role musb_usb_role_sx_get(struct usb_role_switch *sw)
> +{
> +	struct mtk_glue *glue =3D usb_role_switch_get_drvdata(sw);
> =20
>  	return glue->role;
>  }
> @@ -182,6 +186,7 @@ static int mtk_otg_switch_init(struct mtk_glue *glue)
>  	role_sx_desc.set =3D musb_usb_role_sx_set;
>  	role_sx_desc.get =3D musb_usb_role_sx_get;
>  	role_sx_desc.fwnode =3D dev_fwnode(glue->dev);
> +	role_sx_desc.driver_data =3D glue;
>  	glue->role_sw =3D usb_role_switch_register(glue->dev, &role_sx_desc);
> =20
>  	return PTR_ERR_OR_ZERO(glue->role_sw);
> @@ -288,8 +293,7 @@ static int mtk_musb_set_mode(struct musb *musb, u8 mo=
de)
>  		return -EINVAL;
>  	}
> =20
> -	glue->role =3D new_role;
> -	musb_usb_role_sx_set(dev, glue->role);
> +	mtk_otg_switch_set(glue, new_role);
>  	return 0;
>  }
> =20
> diff --git a/drivers/usb/roles/class.c b/drivers/usb/roles/class.c
> index 49511d446410..11e49213176f 100644
> --- a/drivers/usb/roles/class.c
> +++ b/drivers/usb/roles/class.c
> @@ -48,7 +48,7 @@ int usb_role_switch_set_role(struct usb_role_switch *sw=
, enum usb_role role)
> =20
>  	mutex_lock(&sw->lock);
> =20
> -	ret =3D sw->set(sw->dev.parent, role);
> +	ret =3D sw->set(sw, role);
>  	if (!ret)
>  		sw->role =3D role;
> =20
> @@ -75,7 +75,7 @@ enum usb_role usb_role_switch_get_role(struct usb_role_=
switch *sw)
>  	mutex_lock(&sw->lock);
> =20
>  	if (sw->get)
> -		role =3D sw->get(sw->dev.parent);
> +		role =3D sw->get(sw);
>  	else
>  		role =3D sw->role;
> =20
> diff --git a/drivers/usb/roles/intel-xhci-usb-role-switch.c b/drivers/usb=
/roles/intel-xhci-usb-role-switch.c
> index 80d6559bbcb2..5c96e929acea 100644
> --- a/drivers/usb/roles/intel-xhci-usb-role-switch.c
> +++ b/drivers/usb/roles/intel-xhci-usb-role-switch.c
> @@ -42,6 +42,7 @@
>  #define DRV_NAME			"intel_xhci_usb_sw"
> =20
>  struct intel_xhci_usb_data {
> +	struct device *dev;
>  	struct usb_role_switch *role_sw;
>  	void __iomem *base;
>  	bool enable_sw_switch;
> @@ -51,9 +52,10 @@ static const struct software_node intel_xhci_usb_node =
=3D {
>  	"intel-xhci-usb-sw",
>  };
> =20
> -static int intel_xhci_usb_set_role(struct device *dev, enum usb_role rol=
e)
> +static int intel_xhci_usb_set_role(struct usb_role_switch *sw,
> +				   enum usb_role role)
>  {
> -	struct intel_xhci_usb_data *data =3D dev_get_drvdata(dev);
> +	struct intel_xhci_usb_data *data =3D usb_role_switch_get_drvdata(sw);
>  	unsigned long timeout;
>  	acpi_status status;
>  	u32 glk, val;
> @@ -66,11 +68,11 @@ static int intel_xhci_usb_set_role(struct device *dev=
, enum usb_role role)
>  	 */
>  	status =3D acpi_acquire_global_lock(ACPI_WAIT_FOREVER, &glk);
>  	if (ACPI_FAILURE(status) && status !=3D AE_NOT_CONFIGURED) {
> -		dev_err(dev, "Error could not acquire lock\n");
> +		dev_err(data->dev, "Error could not acquire lock\n");
>  		return -EIO;
>  	}
> =20
> -	pm_runtime_get_sync(dev);
> +	pm_runtime_get_sync(data->dev);
> =20
>  	/*
>  	 * Set idpin value as requested.
> @@ -112,7 +114,7 @@ static int intel_xhci_usb_set_role(struct device *dev=
, enum usb_role role)
>  	do {
>  		val =3D readl(data->base + DUAL_ROLE_CFG1);
>  		if (!!(val & HOST_MODE) =3D=3D (role =3D=3D USB_ROLE_HOST)) {
> -			pm_runtime_put(dev);
> +			pm_runtime_put(data->dev);
>  			return 0;
>  		}
> =20
> @@ -120,21 +122,21 @@ static int intel_xhci_usb_set_role(struct device *d=
ev, enum usb_role role)
>  		usleep_range(5000, 10000);
>  	} while (time_before(jiffies, timeout));
> =20
> -	pm_runtime_put(dev);
> +	pm_runtime_put(data->dev);
> =20
> -	dev_warn(dev, "Timeout waiting for role-switch\n");
> +	dev_warn(data->dev, "Timeout waiting for role-switch\n");
>  	return -ETIMEDOUT;
>  }
> =20
> -static enum usb_role intel_xhci_usb_get_role(struct device *dev)
> +static enum usb_role intel_xhci_usb_get_role(struct usb_role_switch *sw)
>  {
> -	struct intel_xhci_usb_data *data =3D dev_get_drvdata(dev);
> +	struct intel_xhci_usb_data *data =3D usb_role_switch_get_drvdata(sw);
>  	enum usb_role role;
>  	u32 val;
> =20
> -	pm_runtime_get_sync(dev);
> +	pm_runtime_get_sync(data->dev);
>  	val =3D readl(data->base + DUAL_ROLE_CFG0);
> -	pm_runtime_put(dev);
> +	pm_runtime_put(data->dev);
> =20
>  	if (!(val & SW_IDPIN))
>  		role =3D USB_ROLE_HOST;
> @@ -175,7 +177,9 @@ static int intel_xhci_usb_probe(struct platform_devic=
e *pdev)
>  	sw_desc.get =3D intel_xhci_usb_get_role,
>  	sw_desc.allow_userspace_control =3D true,
>  	sw_desc.fwnode =3D software_node_fwnode(&intel_xhci_usb_node);
> +	sw_desc.driver_data =3D data;
> =20
> +	data->dev =3D dev;
>  	data->enable_sw_switch =3D !device_property_read_bool(dev,
>  						"sw_switch_disable");
> =20
> diff --git a/include/linux/usb/role.h b/include/linux/usb/role.h
> index 02dae936cebd..c028ba8029ad 100644
> --- a/include/linux/usb/role.h
> +++ b/include/linux/usb/role.h
> @@ -13,8 +13,9 @@ enum usb_role {
>  	USB_ROLE_DEVICE,
>  };
> =20
> -typedef int (*usb_role_switch_set_t)(struct device *dev, enum usb_role r=
ole);
> -typedef enum usb_role (*usb_role_switch_get_t)(struct device *dev);
> +typedef int (*usb_role_switch_set_t)(struct usb_role_switch *sw,
> +				     enum usb_role role);
> +typedef enum usb_role (*usb_role_switch_get_t)(struct usb_role_switch *s=
w);
> =20
>  /**
>   * struct usb_role_switch_desc - USB Role Switch Descriptor
> --=20
> 2.25.0
>=20

--=20

Thanks,
Peter Chen=