From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
To: Roger Quadros <rogerq@ti.com>
Cc: balbi@ti.com, bcousson@baylibre.com, tony@atomide.com,
kishon@ti.com, george.cherian@ti.com, dmurphy@ti.com,
linux-usb@vger.kernel.org, linux-omap@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org
Subject: Re: [PATCH v2 1/8] usb: phy: omap-control: Get rid of platform data
Date: Thu, 15 Aug 2013 18:22:29 +0200 [thread overview]
Message-ID: <20130815162229.GA10982@linutronix.de> (raw)
In-Reply-To: <1376572512-9561-2-git-send-email-rogerq@ti.com>
* Roger Quadros | 2013-08-15 16:15:05 [+0300]:
>diff --git a/drivers/usb/phy/phy-omap-control.c b/drivers/usb/phy/phy-omap-control.c
>index a4dda8e..3b9ee83 100644
>--- a/drivers/usb/phy/phy-omap-control.c
>+++ b/drivers/usb/phy/phy-omap-control.c
>@@ -197,8 +197,13 @@ 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);
>+
>+ if (np) {
>+ of_property_read_u32(np, "ti,type", &control_usb->type);
>+ } else {
>+ /* We only support DT boot */
>+ return -ENODEV;
>+ }
what about
if (!nop)
return -EINVAL;
> control_usb = devm_kzalloc(&pdev->dev, sizeof(*control_usb),
> GFP_KERNEL);
>@@ -207,15 +212,6 @@ static int omap_control_usb_probe(struct platform_device *pdev)
> return -ENOMEM;
> }
>
>- if (np) {
>- of_property_read_u32(np, "ti,type", &control_usb->type);
and here you shift the property to the left and remove the other lines.
But then you wanted to remove that ti,type thingy but I guess this will
be part of another patch then. Since you can't do everything in one
patch, it is okay.
>- } else if (pdata) {
>- control_usb->type = pdata->type;
>- } else {
>- dev_err(&pdev->dev, "no pdata present\n");
>- return -EINVAL;
>- }
>-
> control_usb->dev = &pdev->dev;
>
> res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
Sebastian
next prev parent reply other threads:[~2013-08-15 16:22 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-15 13:15 [PATCH v2 0/8] phy: omap-usb: Support multiple instances and new types Roger Quadros
2013-08-15 13:15 ` [PATCH v2 3/8] usb: phy: omap-usb2: Don't use omap_get_control_dev() Roger Quadros
2013-08-15 13:15 ` [PATCH v2 5/8] usb: musb: omap2430: " Roger Quadros
[not found] ` <1376572512-9561-1-git-send-email-rogerq-l0cyMroinI0@public.gmane.org>
2013-08-15 13:15 ` [PATCH v2 1/8] usb: phy: omap-control: Get rid of platform data Roger Quadros
2013-08-15 16:22 ` Sebastian Andrzej Siewior [this message]
2013-08-16 8:57 ` Roger Quadros
2013-08-15 13:15 ` [PATCH v2 2/8] usb: phy: omap: Add new device types and remove omap_control_usb3_phy_power() Roger Quadros
2013-08-15 13:58 ` Benoit Cousson
2013-08-16 9:09 ` Roger Quadros
2013-08-15 13:15 ` [PATCH v2 4/8] usb: phy: omap-usb3: Don't use omap_get_control_dev() Roger Quadros
2013-08-15 13:15 ` [PATCH v2 6/8] usb: phy: omap: get rid of omap_get_control_dev() Roger Quadros
[not found] ` <1376572512-9561-7-git-send-email-rogerq-l0cyMroinI0@public.gmane.org>
2013-08-15 16:51 ` Sebastian Andrzej Siewior
2013-08-16 9:00 ` Roger Quadros
[not found] ` <520DEA2B.5030608-l0cyMroinI0@public.gmane.org>
2013-08-16 9:07 ` Sebastian Andrzej Siewior
2013-08-15 13:15 ` [PATCH v2 7/8] ARM: dts: omap4: update omap-control-usb nodes Roger Quadros
2013-08-15 13:15 ` [PATCH v2 8/8] ARM: dts: omap5: update omap-control-usb node 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=20130815162229.GA10982@linutronix.de \
--to=bigeasy@linutronix.de \
--cc=balbi@ti.com \
--cc=bcousson@baylibre.com \
--cc=devicetree@vger.kernel.org \
--cc=dmurphy@ti.com \
--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=rogerq@ti.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).