UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

usb: renesas_usbhs: Use struct platform_callback pointer 

Now the driver fixes the issue of the commit 482982062f ("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: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Yoshihiro Shimoda 2019-06-25 14:38:57 +09:00 committed by Greg Kroah-Hartman
parent 76eff170bb
commit 426d3ff2f5
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/usb/renesas_usbhs/common.c
View File

@ -53,8 +53,8 @@
*/ */
#define usbhs_platform_call(priv, func, args...)\ #define usbhs_platform_call(priv, func, args...)\
(!(priv) ? -ENODEV : \ (!(priv) ? -ENODEV : \
!((priv)->pfunc.func) ? 0 : \ !((priv)->pfunc->func) ? 0 : \
(priv)->pfunc.func(args)) (priv)->pfunc->func(args))
/* /*
* common functions * common functions
@ -644,7 +644,7 @@ static int usbhs_probe(struct platform_device *pdev)
dev_err(dev, "no platform callbacks\n"); dev_err(dev, "no platform callbacks\n");
return -EINVAL; return -EINVAL;
} }
priv->pfunc = info->platform_callback; priv->pfunc = &info->platform_callback;
/* set default param if platform doesn't have */ /* set default param if platform doesn't have */
if (usbhs_get_dparam(priv, has_new_pipe_configs)) { if (usbhs_get_dparam(priv, has_new_pipe_configs)) {
@ -665,7 +665,7 @@ static int usbhs_probe(struct platform_device *pdev)
/* FIXME */ /* FIXME */
/* runtime power control ? */ /* runtime power control ? */
if (priv->pfunc.get_vbus) if (priv->pfunc->get_vbus)
usbhs_get_dparam(priv, runtime_pwctrl) = 1; usbhs_get_dparam(priv, runtime_pwctrl) = 1;
/* /*

2
drivers/usb/renesas_usbhs/common.h
View File

@ -252,7 +252,7 @@ struct usbhs_priv {
unsigned int irq; unsigned int irq;
unsigned long irqflags; unsigned long irqflags;
struct renesas_usbhs_platform_callback pfunc; const struct renesas_usbhs_platform_callback *pfunc;
struct renesas_usbhs_driver_param dparam; struct renesas_usbhs_driver_param dparam;
struct delayed_work notify_hotplug_work; struct delayed_work notify_hotplug_work;

2
drivers/usb/renesas_usbhs/mod.c
View File

@ -52,7 +52,7 @@ void usbhs_mod_non_autonomy_mode(struct usbhs_priv *priv)
{ {
struct usbhs_mod_info *info = usbhs_priv_to_modinfo(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;
} }
/* /*