| Message ID | 1376572512-9561-2-git-send-email-rogerq@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* 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
Hi Sebastian, On 08/15/2013 07:22 PM, Sebastian Andrzej Siewior wrote: > * 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; OK, I can change it to -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. I've actually moved the ti,type stuff on the top. So there is no functional change other than getting rid of platform data. > >> - } 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, > cheers, -roger
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; + } 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); - } 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, 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,
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 | 18 +++++++----------- include/linux/usb/omap_control_usb.h | 4 ---- 2 files changed, 7 insertions(+), 15 deletions(-)