usb: renesas_usbhs: use delayed_work instead of work_struct

This delay is used to overjump debounce.

And, this patch also move usbhsc_drvcllbck_notify_hotplug to global,
because it will be called from other files.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/renesas_usbhs/common.c b/drivers/usb/renesas_usbhs/common.c
index db13cef9effe41d2b5d174fcbf715a9c6e5dd724..9a75a45687bbf2b5a00daf7564bf6ef744fe6b3b 100644 (file)
--- a/drivers/usb/renesas_usbhs/common.c
+++ b/drivers/usb/renesas_usbhs/common.c
@@ -178,7 +178,7 @@ static void usbhsc_notify_hotplug(struct work_struct *work)
 {
        struct usbhs_priv *priv = container_of(work,
                                               struct usbhs_priv,
-                                              notify_hotplug_work);
+                                              notify_hotplug_work.work);
        struct platform_device *pdev = usbhs_priv_to_pdev(priv);
        struct usbhs_mod *mod = usbhs_mod_get_current(priv);
        int id;
@@ -224,16 +224,17 @@ static void usbhsc_notify_hotplug(struct work_struct *work)
        }
 }
 
-static int usbhsc_drvcllbck_notify_hotplug(struct platform_device *pdev)
+int usbhsc_drvcllbck_notify_hotplug(struct platform_device *pdev)
 {
        struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev);
+       int delay = usbhs_get_dparam(priv, detection_delay);
 
        /*
         * This functions will be called in interrupt.
         * To make sure safety context,
         * use workqueue for usbhs_notify_hotplug
         */
-       schedule_work(&priv->notify_hotplug_work);
+       schedule_delayed_work(&priv->notify_hotplug_work, delay);
        return 0;
 }
 
@@ -300,7 +301,7 @@ static int __devinit usbhs_probe(struct platform_device *pdev)
         */
        priv->irq       = irq;
        priv->pdev      = pdev;
-       INIT_WORK(&priv->notify_hotplug_work, usbhsc_notify_hotplug);
+       INIT_DELAYED_WORK(&priv->notify_hotplug_work, usbhsc_notify_hotplug);
        spin_lock_init(usbhs_priv_to_lock(priv));
 
        /* call pipe and module init */

diff --git a/drivers/usb/renesas_usbhs/common.h b/drivers/usb/renesas_usbhs/common.h
index f3b907d2608251ea106a4b56e8d4fa82a63edeae..0157eb805cf683a2a19549122dc5a91e60b85b3f 100644 (file)
--- a/drivers/usb/renesas_usbhs/common.h
+++ b/drivers/usb/renesas_usbhs/common.h
@@ -177,7 +177,7 @@ struct usbhs_priv {
        struct renesas_usbhs_platform_callback  *pfunc;
        struct renesas_usbhs_driver_param       *dparam;
 
-       struct work_struct notify_hotplug_work;
+       struct delayed_work notify_hotplug_work;
        struct platform_device *pdev;
 
        spinlock_t              lock;
@@ -200,6 +200,7 @@ u16 usbhs_read(struct usbhs_priv *priv, u32 reg);
 void usbhs_write(struct usbhs_priv *priv, u32 reg, u16 data);
 void usbhs_bset(struct usbhs_priv *priv, u32 reg, u16 mask, u16 data);
 
+int usbhsc_drvcllbck_notify_hotplug(struct platform_device *pdev);
 /*
  * sysconfig
  */

diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
index 66bbdd12d153f5853eabda480ae8c9930ebbb469..3a7f1d982dd6436aec9c8748d6ace583158b111f 100644 (file)
--- a/include/linux/usb/renesas_usbhs.h
+++ b/include/linux/usb/renesas_usbhs.h
@@ -103,6 +103,13 @@ struct renesas_usbhs_driver_param {
         * for BUSWAIT :: BWAIT
         * */
        int buswait_bwait;
+
+       /*
+        * option:
+        *
+        * delay time from notify_hotplug callback
+        */
+       int detection_delay;
 };
 
 /*