summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvinash Kumar <avinash.kumar@stericsson.com>2011-09-19 16:51:21 +0530
committerUlf Hansson <ulf.hansson@stericsson.com>2011-09-19 16:22:30 +0200
commit0f172f6cd907e322fc1eb17a619aecba623eff32 (patch)
treef126cfd8ff350aac0c31e9b12ff26dec39255404
parentee35aaef0e49fc7a7878f1c869b7eb9e61cbe4b0 (diff)
u5500: usb: Kernel 3.0 fix for delayed work
fixing issue of scheduling delayed work work_usb_workaround which is not needed for u5500 ST-Ericsson ID: 352334 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: NA Signed-off-by: Avinash Kumar <avinash.kumar@stericsson.com> Change-Id: I07eaca9f90aa91892f05260e7722e6703e8baf84 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/31340 Reviewed-by: Praveena NADAHALLY <praveen.nadahally@stericsson.com>
-rw-r--r--drivers/usb/otg/ab5500-usb.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/usb/otg/ab5500-usb.c b/drivers/usb/otg/ab5500-usb.c
index fecf15766b5..ed674762616 100644
--- a/drivers/usb/otg/ab5500-usb.c
+++ b/drivers/usb/otg/ab5500-usb.c
@@ -98,7 +98,6 @@ struct ab5500_usb {
struct clk *sysclk;
struct regulator *v_ape;
struct abx500_usbgpio_platform_data *usb_gpio;
- struct delayed_work work_usb_workaround;
};
static int ab5500_usb_irq_setup(struct platform_device *pdev,
@@ -154,12 +153,6 @@ static void ab5500_usb_phy_enable(struct ab5500_usb *ab, bool sel_host)
clk_enable(ab->sysclk);
regulator_enable(ab->v_ape);
- if (!sel_host) {
- schedule_delayed_work_on(0,
- &ab->work_usb_workaround,
- msecs_to_jiffies(USB_PROBE_DELAY));
- }
-
abx500_set_register_interruptible(ab->dev,
AB5500_BANK_USB,
AB5500_USB_PHY_CTRL_REG,
@@ -183,12 +176,6 @@ static void ab5500_usb_phy_disable(struct ab5500_usb *ab, bool sel_host)
regulator_disable(ab->v_ape);
clk_disable(ab->sysclk);
ab->usb_gpio->disable();
- if (!sel_host) {
-
- cancel_delayed_work_sync(&ab->work_usb_workaround);
- prcmu_qos_update_requirement(PRCMU_QOS_ARM_OPP,
- "usb", 25);
- }
wake_unlock(&ab5500_musb_wakelock);
}