devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Roger Quadros <rogerq@ti.com>
To: balbi@ti.com, bcousson@baylibre.com
Cc: tony@atomide.com, george.cherian@ti.com, kishon@ti.com,
	bigeasy@linutronix.de, sergei.shtylyov@cogentembedded.com,
	thomas.langer@lantiq.com, linux-usb@vger.kernel.org,
	linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	devicetree@vger.kernel.org, Roger Quadros <rogerq@ti.com>
Subject: [PATCH v6 1/8] usb: phy: omap-control: Get rid of platform data
Date: Mon, 26 Aug 2013 18:08:26 +0300	[thread overview]
Message-ID: <1377529713-19762-2-git-send-email-rogerq@ti.com> (raw)
In-Reply-To: <1377529713-19762-1-git-send-email-rogerq@ti.com>

omap-control device is present from OMAP4 onwards which
support device tree boots only. So get rid of platform data.

Signed-off-by: Roger Quadros <rogerq@ti.com>
---
 drivers/usb/phy/phy-omap-control.c   |   12 +++---------
 include/linux/usb/omap_control_usb.h |    4 ----
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/drivers/usb/phy/phy-omap-control.c b/drivers/usb/phy/phy-omap-control.c
index a4dda8e..9772592 100644
--- a/drivers/usb/phy/phy-omap-control.c
+++ b/drivers/usb/phy/phy-omap-control.c
@@ -197,8 +197,6 @@ static int omap_control_usb_probe(struct platform_device *pdev)
 {
 	struct resource	*res;
 	struct device_node *np = pdev->dev.of_node;
-	struct omap_control_usb_platform_data *pdata =
-			dev_get_platdata(&pdev->dev);
 
 	control_usb = devm_kzalloc(&pdev->dev, sizeof(*control_usb),
 		GFP_KERNEL);
@@ -207,14 +205,10 @@ static int omap_control_usb_probe(struct platform_device *pdev)
 		return -ENOMEM;
 	}
 
-	if (np) {
+	if (np)
 		of_property_read_u32(np, "ti,type", &control_usb->type);
-	} else if (pdata) {
-		control_usb->type = pdata->type;
-	} else {
-		dev_err(&pdev->dev, "no pdata present\n");
-		return -EINVAL;
-	}
+	else
+		return -EINVAL;	/* We only support DT boot */
 
 	control_usb->dev	= &pdev->dev;
 
diff --git a/include/linux/usb/omap_control_usb.h b/include/linux/usb/omap_control_usb.h
index 27b5b8c..e2416b4 100644
--- a/include/linux/usb/omap_control_usb.h
+++ b/include/linux/usb/omap_control_usb.h
@@ -31,10 +31,6 @@ struct omap_control_usb {
 	u32 type;
 };
 
-struct omap_control_usb_platform_data {
-	u8 type;
-};
-
 enum omap_control_usb_mode {
 	USB_MODE_UNDEFINED = 0,
 	USB_MODE_HOST,
-- 
1.7.4.1


  reply	other threads:[~2013-08-26 15:08 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-26 15:08 [PATCH v6 0/8] phy: omap-usb: Support multiple instances and new types Roger Quadros
2013-08-26 15:08 ` Roger Quadros [this message]
2013-08-26 15:08 ` [PATCH v6 2/8] usb: phy: omap: Add new device types and remove omap_control_usb3_phy_power() Roger Quadros
2013-08-26 15:08 ` [PATCH v6 4/8] usb: phy: omap-usb3: Don't use omap_get_control_dev() Roger Quadros
2013-08-26 15:08 ` [PATCH v6 5/8] usb: musb: omap2430: " Roger Quadros
     [not found] ` <1377529713-19762-1-git-send-email-rogerq-l0cyMroinI0@public.gmane.org>
2013-08-26 15:08   ` [PATCH v6 3/8] usb: phy: omap-usb2: " Roger Quadros
2013-08-26 15:08   ` [PATCH v6 6/8] usb: phy: omap: get rid of omap_get_control_dev() Roger Quadros
2013-08-26 15:08 ` [PATCH v6 7/8] ARM: dts: omap4: update omap-control-usb nodes Roger Quadros
     [not found]   ` <1377529713-19762-8-git-send-email-rogerq-l0cyMroinI0@public.gmane.org>
2013-09-23 19:43     ` Felipe Balbi
2013-08-26 15:08 ` [PATCH v6 8/8] ARM: dts: omap5: update omap-control-usb node Roger Quadros
     [not found]   ` <1377529713-19762-9-git-send-email-rogerq-l0cyMroinI0@public.gmane.org>
2013-09-23 19:43     ` Felipe Balbi

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=1377529713-19762-2-git-send-email-rogerq@ti.com \
    --to=rogerq@ti.com \
    --cc=balbi@ti.com \
    --cc=bcousson@baylibre.com \
    --cc=bigeasy@linutronix.de \
    --cc=devicetree@vger.kernel.org \
    --cc=george.cherian@ti.com \
    --cc=kishon@ti.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=sergei.shtylyov@cogentembedded.com \
    --cc=thomas.langer@lantiq.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;
as well as URLs for NNTP newsgroup(s).