From: Kishon Vijay Abraham I <kishon@ti.com>
To: rob.herring@calxeda.com, rob@landley.net, balbi@ti.com,
linux-usb@vger.kernel.org, linux-omap@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org,
devicetree-discuss@lists.ozlabs.org
Cc: grant.likely@secretlab.ca, gregkh@linuxfoundation.org, kishon@ti.com
Subject: [PATCH v3 07/11] usb: dwc3-omap: remove platform data associated with dwc3-omap
Date: Fri, 25 Jan 2013 08:30:51 +0530 [thread overview]
Message-ID: <1359082855-7404-8-git-send-email-kishon@ti.com> (raw)
In-Reply-To: <1359082855-7404-1-git-send-email-kishon@ti.com>
omap5 is not going to have support for non-dt boot making the platform
data associated with dwc3 useless. Removed it here.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
drivers/usb/dwc3/dwc3-omap.c | 24 ++++++++++--------------
include/linux/platform_data/dwc3-omap.h | 4 ----
2 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c
index cc2ccba..4e96fbe 100644
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@ -311,7 +311,6 @@ static int dwc3_omap_remove_core(struct device *dev, void *c)
static int dwc3_omap_probe(struct platform_device *pdev)
{
- struct dwc3_omap_data *pdata = pdev->dev.platform_data;
struct device_node *node = pdev->dev.of_node;
struct dwc3_omap *omap;
@@ -328,6 +327,11 @@ static int dwc3_omap_probe(struct platform_device *pdev)
void __iomem *base;
void *context;
+ if (!node) {
+ dev_err(dev, "device node not found\n");
+ return -EINVAL;
+ }
+
omap = devm_kzalloc(dev, sizeof(*omap), GFP_KERNEL);
if (!omap) {
dev_err(dev, "not enough memory\n");
@@ -389,12 +393,7 @@ static int dwc3_omap_probe(struct platform_device *pdev)
reg = dwc3_omap_readl(omap->base, USBOTGSS_UTMI_OTG_STATUS);
- if (node)
- of_property_read_u32(node, "utmi-mode", &utmi_mode);
- else if (pdata)
- utmi_mode = pdata->utmi_mode;
- else
- dev_dbg(dev, "missing platform data\n");
+ of_property_read_u32(node, "utmi-mode", &utmi_mode);
switch (utmi_mode) {
case DWC3_OMAP_UTMI_MODE_SW:
@@ -437,13 +436,10 @@ static int dwc3_omap_probe(struct platform_device *pdev)
dwc3_omap_writel(omap->base, USBOTGSS_IRQENABLE_SET_1, reg);
- if (node) {
- ret = of_platform_populate(node, NULL, NULL, dev);
- if (ret) {
- dev_err(&pdev->dev,
- "failed to add create dwc3 core\n");
- return ret;
- }
+ ret = of_platform_populate(node, NULL, NULL, dev);
+ if (ret) {
+ dev_err(&pdev->dev, "failed to create dwc3 core\n");
+ return ret;
}
return 0;
diff --git a/include/linux/platform_data/dwc3-omap.h b/include/linux/platform_data/dwc3-omap.h
index ada4012..1d36ca8 100644
--- a/include/linux/platform_data/dwc3-omap.h
+++ b/include/linux/platform_data/dwc3-omap.h
@@ -41,7 +41,3 @@ enum dwc3_omap_utmi_mode {
DWC3_OMAP_UTMI_MODE_HW,
DWC3_OMAP_UTMI_MODE_SW,
};
-
-struct dwc3_omap_data {
- enum dwc3_omap_utmi_mode utmi_mode;
-};
--
1.7.9.5
next prev parent reply other threads:[~2013-01-25 3:01 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-25 3:00 [PATCH v3 00/11] usb: dwc3 core/dwc3-omap: add dt support Kishon Vijay Abraham I
2013-01-25 3:00 ` [PATCH v3 01/11] usb: dwc3-omap: use device_for_each_child to handle child removal Kishon Vijay Abraham I
2013-01-25 3:00 ` [PATCH v3 03/11] usb: dwc3-omap: use runtime API's to enable clocks Kishon Vijay Abraham I
2013-01-25 3:00 ` [PATCH v3 05/11] usb: dwc3-omap: Add an API to write to dwc mailbox Kishon Vijay Abraham I
[not found] ` <1359082855-7404-1-git-send-email-kishon-l0cyMroinI0@public.gmane.org>
2013-01-25 3:00 ` [PATCH v3 02/11] usb: dwc3-omap: use of_platform API to create dwc3 core pdev Kishon Vijay Abraham I
2013-01-25 3:00 ` [PATCH v3 04/11] usb: dwc3-omap: Remove explicit writes to SYSCONFIG register Kishon Vijay Abraham I
2013-01-25 3:00 ` [PATCH v3 06/11] usb: dwc3-omap: Minor fixes to get dt working Kishon Vijay Abraham I
2013-01-25 3:00 ` [PATCH v3 08/11] usb: dwc3-omap: stop using nop-usb-xceiv Kishon Vijay Abraham I
2013-01-25 3:00 ` [PATCH v3 09/11] usb: dwc3: core: add dt support for dwc3 core Kishon Vijay Abraham I
2013-01-25 11:06 ` [PATCH v4 " Kishon Vijay Abraham I
2013-01-25 3:00 ` Kishon Vijay Abraham I [this message]
2013-01-25 3:00 ` [PATCH v3 10/11] usb: dwc3: core: enable the USB2 and USB3 phy in probe Kishon Vijay Abraham I
2013-01-25 3:00 ` [PATCH v3 11/11] usb: dwc3: core: stray statements are removed Kishon Vijay Abraham I
[not found] ` <1359082855-7404-12-git-send-email-kishon-l0cyMroinI0@public.gmane.org>
2013-01-25 12:23 ` Sergei Shtylyov
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=1359082855-7404-8-git-send-email-kishon@ti.com \
--to=kishon@ti.com \
--cc=balbi@ti.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@secretlab.ca \
--cc=gregkh@linuxfoundation.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=rob.herring@calxeda.com \
--cc=rob@landley.net \
/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;
as well as URLs for NNTP newsgroup(s).