From: Roger Quadros <rogerq@ti.com>
To: <balbi@ti.com>, <sameo@linux.intel.com>, <tony@atomide.com>
Cc: <kishon@ti.com>, <sshtylyov@mvista.com>, <bjorn@mork.no>,
<linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>, <rogerq@ti.com>
Subject: [PATCH v6 16/22] mfd: omap-usb-host: Get rid of unnecessary spinlock
Date: Wed, 16 Jan 2013 16:43:47 +0200 [thread overview]
Message-ID: <1358347433-329-17-git-send-email-rogerq@ti.com> (raw)
In-Reply-To: <1358347433-329-1-git-send-email-rogerq@ti.com>
The driver does not have an interrupt handler and
we don't really need a spinlock, so get rid of it.
Signed-off-by: Roger Quadros <rogerq@ti.com>
---
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 2925d57..844d1b2 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 <linux/platform_device.h>
#include <linux/platform_data/usb-omap.h>
@@ -108,7 +107,6 @@ struct usbhs_hcd_omap {
struct usbhs_omap_platform_data *pdata;
u32 usbhs_rev;
- spinlock_t lock;
};
/*-------------------------------------------------------------------------*/
@@ -276,13 +274,11 @@ static int usbhs_runtime_resume(struct device *dev)
{
struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
struct usbhs_omap_platform_data *pdata = omap->pdata;
- unsigned long flags;
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);
@@ -324,8 +320,6 @@ static int usbhs_runtime_resume(struct device *dev)
}
}
- spin_unlock_irqrestore(&omap->lock, flags);
-
return 0;
}
@@ -333,13 +327,10 @@ static int usbhs_runtime_suspend(struct device *dev)
{
struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
struct usbhs_omap_platform_data *pdata = omap->pdata;
- unsigned long flags;
int i;
dev_dbg(dev, "usbhs_runtime_suspend\n");
- spin_lock_irqsave(&omap->lock, flags);
-
for (i = 0; i < omap->nports; i++) {
switch (pdata->port_mode[i]) {
case OMAP_EHCI_PORT_MODE_HSIC:
@@ -362,7 +353,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;
@@ -372,7 +362,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;
dev_dbg(dev, "starting TI HSUSB Controller\n");
@@ -391,7 +380,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 */
@@ -454,8 +442,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->phy_reset) {
/* Hold the PHY in RESET for enough time till
@@ -521,8 +507,6 @@ static int usbhs_omap_probe(struct platform_device *pdev)
return -ENOMEM;
}
- spin_lock_init(&omap->lock);
-
omap->pdata = pdata;
pm_runtime_enable(dev);
--
1.7.4.1
next prev parent reply other threads:[~2013-01-16 14:47 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-16 14:43 [PATCH v6 00/22] OMAP USB Host cleanup Roger Quadros
2013-01-16 14:43 ` [PATCH v6 01/22] mfd: omap-usb-host: Consolidate OMAP USB-HS platform data Roger Quadros
2013-01-16 14:43 ` [PATCH v6 02/22] mfd: omap-usb-tll: Fix channel count detection Roger Quadros
2013-01-16 14:43 ` [PATCH v6 03/22] mfd: omap-usb-tll: Use devm_kzalloc/ioremap and clean up error path Roger Quadros
2013-01-16 19:37 ` Sergei Shtylyov
2013-01-17 9:12 ` Roger Quadros
2013-01-17 10:32 ` Roger Quadros
2013-01-16 14:43 ` [PATCH v6 04/22] mfd: omap-usb-tll: Clean up clock handling Roger Quadros
2013-01-16 14:55 ` Russell King - ARM Linux
2013-01-16 15:05 ` Roger Quadros
2013-01-16 14:43 ` [PATCH v6 05/22] mfd: omap-usb-tll: introduce and use mode_needs_tll() Roger Quadros
2013-01-16 14:43 ` [PATCH v6 06/22] mfd: omap-usb-tll: Check for missing platform data in probe Roger Quadros
2013-01-16 14:43 ` [PATCH v6 07/22] mfd: omap-usb-tll: Fix error message Roger Quadros
2013-01-16 14:43 ` [PATCH v6 08/22] mfd: omap-usb-tll: serialize access to TLL device Roger Quadros
2013-01-16 14:43 ` [PATCH v6 09/22] mfd: omap-usb-tll: Add OMAP5 revision and HSIC support Roger Quadros
2013-01-16 14:43 ` [PATCH v6 10/22] mfd: omap_usb_host: Avoid missing platform data checks in suspend/resume Roger Quadros
2013-01-16 14:43 ` [PATCH v6 11/22] mfd: omap-usb-host: Use devm_kzalloc() and devm_request_and_ioremap() Roger Quadros
2013-01-16 19:34 ` Sergei Shtylyov
2013-01-16 14:43 ` [PATCH v6 12/22] mfd: omap-usb-host: know about number of ports from revision register Roger Quadros
2013-01-16 14:43 ` [PATCH v6 13/22] mfd: omap-usb-host: override number of ports from platform data Roger Quadros
2013-01-16 14:43 ` [PATCH v6 14/22] mfd: omap-usb-host: cleanup clock management code Roger Quadros
2013-01-16 14:43 ` [PATCH v6 15/22] mfd: omap-usb-host: Manage HSIC clocks for HSIC mode Roger Quadros
2013-01-16 14:43 ` Roger Quadros [this message]
2013-01-16 14:43 ` [PATCH v6 17/22] mfd: omap-usb-host: clean up omap_usbhs_init() Roger Quadros
2013-01-16 14:43 ` [PATCH v6 18/22] USB: ehci-omap: Don't free gpios that we didn't request Roger Quadros
2013-01-16 14:43 ` [PATCH v6 19/22] ARM: OMAP3: clock data: get rid of unused USB host clock aliases and dummies Roger Quadros
2013-01-16 14:43 ` [PATCH v6 20/22] ARM: OMAP4: clock data: get rid of unused USB host clock aliases Roger Quadros
2013-01-16 14:43 ` [PATCH v6 21/22] mfd: omap-usb-host: Don't spam console on clk_set_parent failure Roger Quadros
2013-01-16 14:43 ` [PATCH v6 22/22] mdf: omap-usb-host: get rid of build warning Roger Quadros
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1358347433-329-17-git-send-email-rogerq@ti.com \
--to=rogerq@ti.com \
--cc=balbi@ti.com \
--cc=bjorn@mork.no \
--cc=kishon@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=sameo@linux.intel.com \
--cc=sshtylyov@mvista.com \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®