Commit 426d3ff2 authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Greg Kroah-Hartman
Browse files

usb: renesas_usbhs: Use struct platform_callback pointer 



Now the driver fixes the issue of the commit 48298206 ("usb:
gadget: renesas_usbhs: bugfix: don't modify platform data") by
using usbhs_mod_info.get_vbus, this patches uses the pointer
instead of copied value to avoid redundancy. Note that struct
renesas_usbhs_driver_param has to use copied value because
the driver has to set some members (e.g. buswait_bwait).

Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 76eff170

drivers/usb/renesas_usbhs/common.c

+4 −4
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ 
 */

#define usbhs_platform_call(priv, func, args...)\

	(!(priv) ? -ENODEV :			\

	 !((priv)->pfunc.func) ? 0 :		\

	 (priv)->pfunc.func(args))

	 !((priv)->pfunc->func) ? 0 :		\

	 (priv)->pfunc->func(args))



/*

 *		common functions
@@ -644,7 +644,7 @@ static int usbhs_probe(struct platform_device *pdev) 
		dev_err(dev, "no platform callbacks\n");

		return -EINVAL;

	}

	priv->pfunc = info->platform_callback;

	priv->pfunc = &info->platform_callback;



	/* set default param if platform doesn't have */

	if (usbhs_get_dparam(priv, has_new_pipe_configs)) {
@@ -665,7 +665,7 @@ static int usbhs_probe(struct platform_device *pdev) 


	/* FIXME */

	/* runtime power control ? */

	if (priv->pfunc.get_vbus)

	if (priv->pfunc->get_vbus)

		usbhs_get_dparam(priv, runtime_pwctrl) = 1;



	/*

drivers/usb/renesas_usbhs/common.h

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ struct usbhs_priv { 
	unsigned int irq;

	unsigned long irqflags;



	struct renesas_usbhs_platform_callback	pfunc;

	const struct renesas_usbhs_platform_callback *pfunc;

	struct renesas_usbhs_driver_param	dparam;



	struct delayed_work notify_hotplug_work;

drivers/usb/renesas_usbhs/mod.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ void usbhs_mod_non_autonomy_mode(struct usbhs_priv *priv) 
{

	struct usbhs_mod_info *info = usbhs_priv_to_modinfo(priv);



	info->get_vbus = priv->pfunc.get_vbus;

	info->get_vbus = priv->pfunc->get_vbus;

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE