From: Roger Quadros <rogerq@ti.com>
To: <balbi@ti.com>, <sameo@linux.intel.com>, <tony@atomide.com>
Cc: <keshava_mgowda@ti.com>, <sshtylyov@mvista.com>, <bjorn@mork.no>,
<rogerq@ti.com>, <linux-usb@vger.kernel.org>,
<linux-omap@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH v5 10/22] mfd: omap_usb_host: Avoid creating copy of platform_data
Date: Wed, 2 Jan 2013 17:00:30 +0200 [thread overview]
Message-ID: <1357138842-28964-11-git-send-email-rogerq@ti.com> (raw)
In-Reply-To: <1357138842-28964-1-git-send-email-rogerq@ti.com>
We can just hold the pointer to the platform data instead
of creating a copy of it.
Also get rid of the unnecessary missing platform data checks
in runtime_suspend/resume. We are already checking for missing
platform data in probe.
Signed-off-by: Roger Quadros <rogerq@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>
---
drivers/mfd/omap-usb-host.c | 30 ++++++++----------------------
1 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index 05164d7..85a4a43 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -102,7 +102,7 @@ struct usbhs_hcd_omap {
void __iomem *uhh_base;
- struct usbhs_omap_platform_data platdata;
+ struct usbhs_omap_platform_data *pdata;
u32 usbhs_rev;
spinlock_t lock;
@@ -194,8 +194,8 @@ static int omap_usbhs_alloc_children(struct platform_device *pdev)
int ret;
omap = platform_get_drvdata(pdev);
- ehci_data = omap->platdata.ehci_data;
- ohci_data = omap->platdata.ohci_data;
+ ehci_data = omap->pdata->ehci_data;
+ ohci_data = omap->pdata->ohci_data;
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ehci");
if (!res) {
@@ -278,16 +278,11 @@ 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);
- struct usbhs_omap_platform_data *pdata = &omap->platdata;
unsigned long flags;
+ struct usbhs_omap_platform_data *pdata = omap->pdata;
dev_dbg(dev, "usbhs_runtime_resume\n");
- if (!pdata) {
- dev_dbg(dev, "missing platform_data\n");
- return -ENODEV;
- }
-
omap_tll_enable();
spin_lock_irqsave(&omap->lock, flags);
@@ -310,16 +305,11 @@ static int usbhs_runtime_resume(struct device *dev)
static int usbhs_runtime_suspend(struct device *dev)
{
struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
- struct usbhs_omap_platform_data *pdata = &omap->platdata;
unsigned long flags;
+ struct usbhs_omap_platform_data *pdata = omap->pdata;
dev_dbg(dev, "usbhs_runtime_suspend\n");
- if (!pdata) {
- dev_dbg(dev, "missing platform_data\n");
- return -ENODEV;
- }
-
spin_lock_irqsave(&omap->lock, flags);
if (is_ehci_tll_mode(pdata->port_mode[0]))
@@ -342,7 +332,7 @@ static int usbhs_runtime_suspend(struct device *dev)
static void omap_usbhs_init(struct device *dev)
{
struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
- struct usbhs_omap_platform_data *pdata = &omap->platdata;
+ struct usbhs_omap_platform_data *pdata = omap->pdata;
unsigned long flags;
unsigned reg;
@@ -449,7 +439,7 @@ static void omap_usbhs_init(struct device *dev)
static void omap_usbhs_deinit(struct device *dev)
{
struct usbhs_hcd_omap *omap = dev_get_drvdata(dev);
- struct usbhs_omap_platform_data *pdata = &omap->platdata;
+ struct usbhs_omap_platform_data *pdata = omap->pdata;
if (pdata->ehci_data->phy_reset) {
if (gpio_is_valid(pdata->ehci_data->reset_gpio_port[0]))
@@ -490,11 +480,7 @@ static int usbhs_omap_probe(struct platform_device *pdev)
spin_lock_init(&omap->lock);
- for (i = 0; i < OMAP3_HS_USB_PORTS; i++)
- omap->platdata.port_mode[i] = pdata->port_mode[i];
-
- omap->platdata.ehci_data = pdata->ehci_data;
- omap->platdata.ohci_data = pdata->ohci_data;
+ omap->pdata = pdata;
pm_runtime_enable(dev);
--
1.7.4.1
next prev parent reply other threads:[~2013-01-02 15:01 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-02 15:00 [PATCH v5 00/22] OMAP USB Host cleanup Roger Quadros
2013-01-02 15:00 ` [PATCH v5 01/22] mfd: omap-usb-tll: Avoid creating copy of platform data Roger Quadros
2013-01-02 15:00 ` [PATCH v5 02/22] mfd: omap-usb-tll: Fix channel count detection Roger Quadros
2013-01-02 15:00 ` [PATCH v5 03/22] mfd: omap-usb-tll: Use devm_kzalloc/ioremap and clean up error path Roger Quadros
2013-01-02 15:00 ` [PATCH v5 04/22] mfd: omap-usb-tll: Clean up clock handling Roger Quadros
2013-01-02 15:00 ` [PATCH v5 05/22] mfd: omap-usb-tll: introduce and use mode_needs_tll() Roger Quadros
2013-01-02 15:00 ` [PATCH v5 06/22] mfd: omap-usb-tll: Check for missing platform data in probe Roger Quadros
2013-01-02 15:00 ` [PATCH v5 07/22] mfd: omap-usb-tll: Fix error message Roger Quadros
2013-01-02 15:00 ` [PATCH v5 08/22] mfd: omap-usb-tll: serialize access to TLL device Roger Quadros
2013-01-02 15:00 ` [PATCH v5 09/22] mfd: omap-usb-tll: Add OMAP5 revision and HSIC support Roger Quadros
2013-01-02 15:00 ` Roger Quadros [this message]
2013-01-02 15:00 ` [PATCH v5 11/22] mfd: omap-usb-host: Use devm_kzalloc() and devm_request_and_ioremap() Roger Quadros
2013-01-02 15:00 ` [PATCH v5 12/22] mfd: omap-usb-host: know about number of ports from revision register Roger Quadros
2013-01-02 15:00 ` [PATCH v5 13/22] mfd: omap-usb-host: override number of ports from platform data Roger Quadros
2013-01-03 12:52 ` Sergei Shtylyov
2013-01-04 14:06 ` Roger Quadros
2013-01-02 15:00 ` [PATCH v5 14/22] mfd: omap-usb-host: cleanup clock management code Roger Quadros
2013-01-02 15:00 ` [PATCH v5 15/22] mfd: omap-usb-host: Manage HSIC clocks for HSIC mode Roger Quadros
2013-01-02 15:00 ` [PATCH v5 16/22] mfd: omap-usb-host: Get rid of unnecessary spinlock Roger Quadros
2013-01-02 15:00 ` [PATCH v5 17/22] mfd: omap-usb-host: clean up omap_usbhs_init() Roger Quadros
2013-01-02 15:00 ` [PATCH v5 18/22] USB: ehci-omap: Don't free gpios that we didn't request Roger Quadros
2013-01-02 15:00 ` [PATCH v5 19/22] ARM: OMAP3: clock data: get rid of unused USB host clock aliases and dummies Roger Quadros
2013-01-02 15:00 ` [PATCH v5 20/22] ARM: OMAP4: clock data: get rid of unused USB host clock aliases Roger Quadros
2013-01-02 15:00 ` [PATCH v5 21/22] mfd: omap-usb-host: Don't spam console on clk_set_parent failure Roger Quadros
2013-01-02 15:00 ` [PATCH v5 22/22] mdf: omap-usb-host: get rid of build warning Roger Quadros
2013-01-04 14:17 ` [PATCH v5 00/22] OMAP USB Host cleanup 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=1357138842-28964-11-git-send-email-rogerq@ti.com \
--to=rogerq@ti.com \
--cc=balbi@ti.com \
--cc=bjorn@mork.no \
--cc=keshava_mgowda@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@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®