diff options
| author | Roger Quadros <rogerq@ti.com> | 2012-11-15 11:48:51 +0200 |
|---|---|---|
| committer | Vincent Stehlé <v-stehle@ti.com> | 2012-11-26 15:32:03 +0100 |
| commit | a896337777e45882ed0709f4ab7098a131c5e264 (patch) | |
| tree | f0ffc230dc36fb4239a816374714b7e8ce41c51e | |
| parent | 9cfb7c43611334752456b9ccab3600821e6f30c3 (diff) | |
mfd: omap-usb-host: Get rid of unnecessary spinlock
We don't really need a spinlock here, so get rid of it.
Signed-off-by: Roger Quadros <rogerq@ti.com>
| -rw-r--r-- | drivers/mfd/omap-usb-host.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c index 8beeb82913e2..1a9131e9185f 100644 --- a/drivers/mfd/omap-usb-host.c +++ b/drivers/mfd/omap-usb-host.c @@ -23,7 +23,6 @@ #include <linux/delay.h> #include <linux/clk.h> #include <linux/dma-mapping.h> -#include <linux/spinlock.h> #include <linux/gpio.h> #include <plat/cpu.h> #include <plat/usb.h> @@ -106,7 +105,6 @@ struct usbhs_hcd_omap { struct usbhs_omap_platform_data *pdata; u32 usbhs_rev; - spinlock_t lock; }; /*-------------------------------------------------------------------------*/ @@ -279,14 +277,12 @@ static bool is_ohci_port(enum usbhs_omap_port_mode pmode) static int usbhs_runtime_resume(struct device *dev) { struct usbhs_hcd_omap *omap = dev_get_drvdata(dev); - unsigned long flags; struct usbhs_omap_platform_data *pdata = omap->pdata; int i, r; dev_dbg(dev, "usbhs_runtime_resume\n"); omap_tll_enable(); - spin_lock_irqsave(&omap->lock, flags); if (omap->ehci_logic_fck && !IS_ERR(omap->ehci_logic_fck)) clk_enable(omap->ehci_logic_fck); @@ -325,22 +321,17 @@ static int usbhs_runtime_resume(struct device *dev) } } - spin_unlock_irqrestore(&omap->lock, flags); - return 0; } static int usbhs_runtime_suspend(struct device *dev) { struct usbhs_hcd_omap *omap = dev_get_drvdata(dev); - unsigned long flags; struct usbhs_omap_platform_data *pdata = omap->pdata; int i; dev_dbg(dev, "usbhs_runtime_suspend\n"); - spin_lock_irqsave(&omap->lock, flags); - for (i = 0; i < omap->nports; i++) { if (is_ehci_tll_mode(pdata->port_mode[i]) || is_ehci_hsic_mode(pdata->port_mode[i])) { @@ -360,7 +351,6 @@ static int usbhs_runtime_suspend(struct device *dev) if (omap->ehci_logic_fck && !IS_ERR(omap->ehci_logic_fck)) clk_disable(omap->ehci_logic_fck); - spin_unlock_irqrestore(&omap->lock, flags); omap_tll_disable(); return 0; @@ -370,7 +360,6 @@ static void omap_usbhs_init(struct device *dev) { struct usbhs_hcd_omap *omap = dev_get_drvdata(dev); struct usbhs_omap_platform_data *pdata = omap->pdata; - unsigned long flags; unsigned reg; int i; @@ -390,7 +379,6 @@ static void omap_usbhs_init(struct device *dev) } pm_runtime_get_sync(dev); - spin_lock_irqsave(&omap->lock, flags); reg = usbhs_read(omap->uhh_base, OMAP_UHH_HOSTCONFIG); /* setup ULPI bypass and burst configurations */ @@ -448,8 +436,6 @@ static void omap_usbhs_init(struct device *dev) usbhs_write(omap->uhh_base, OMAP_UHH_HOSTCONFIG, reg); dev_dbg(dev, "UHH setup done, uhh_hostconfig=%x\n", reg); - spin_unlock_irqrestore(&omap->lock, flags); - pm_runtime_put_sync(dev); if (pdata->ehci_data->phy_reset) { /* Hold the PHY in RESET for enough time till @@ -521,8 +507,6 @@ static int __devinit usbhs_omap_probe(struct platform_device *pdev) goto err_remap; } - spin_lock_init(&omap->lock); - omap->pdata = pdata; platform_set_drvdata(pdev, omap); pm_runtime_enable(dev); |