usb: renesas_usbhs: Use struct platform_callback pointer

Now the driver fixes the issue of the commit 482982062f1b ("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>

diff --git a/drivers/usb/renesas_usbhs/common.c b/drivers/usb/renesas_usbhs/common.c
index fe7dc91..4c3de77 100644 (file)
--- a/drivers/usb/renesas_usbhs/common.c
+++ b/drivers/usb/renesas_usbhs/common.c
@@ -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;
 
        /*

diff --git a/drivers/usb/renesas_usbhs/common.h b/drivers/usb/renesas_usbhs/common.h
index f6ffdb2..d1a0a35 100644 (file)
--- a/drivers/usb/renesas_usbhs/common.h
+++ b/drivers/usb/renesas_usbhs/common.h
@@ -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;

diff --git a/drivers/usb/renesas_usbhs/mod.c b/drivers/usb/renesas_usbhs/mod.c
index ddf0153..10fc655 100644 (file)
--- a/drivers/usb/renesas_usbhs/mod.c
+++ b/drivers/usb/renesas_usbhs/mod.c
@@ -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;
 }
 
 /*