[v4,4/4] USB: OMAP1: Tahvo USB transceiver driver

Commit Message

Felipe Balbi Dec. 6, 2013, 8:46 p.m. UTC

On Fri, Dec 06, 2013 at 04:13:07PM +0200, Aaro Koskinen wrote:
> Add Tahvo USB transceiver driver.
> 
> Based on old code from linux-omap tree. The original driver was written
> by Juha Yrjölä, Tony Lindgren, and Timo Teräs.
> 
> Signed-off-by: Aaro Koskinen <[e-mail]>

compile error:


  CC [M]  drivers/usb/phy/phy-tahvo.o
drivers/usb/phy/phy-tahvo.c: In function ‘tahvo_usb_probe’:
drivers/usb/phy/phy-tahvo.c:371:2: error: too many arguments to function ‘extcon_dev_register’
  ret = extcon_dev_register(&tu->extcon, &pdev->dev);
  ^
In file included from drivers/usb/phy/phy-tahvo.c:26:0:
include/linux/extcon.h:186:12: note: declared here
 extern int extcon_dev_register(struct extcon_dev *edev);
            ^
make[1]: *** [drivers/usb/phy/phy-tahvo.o] Error 1
make: *** [drivers/usb/phy/] Error 2

fixed it up with:


please make sure it still works with v3.13-rc2 + this patch.

Comments

Aaro Koskinen Dec. 7, 2013, 2:16 p.m. UTC | #1

Hi,

On Fri, Dec 06, 2013 at 02:46:29PM -0600, Felipe Balbi wrote:
> On Fri, Dec 06, 2013 at 04:13:07PM +0200, Aaro Koskinen wrote:
> > Add Tahvo USB transceiver driver.
> > 
> > Based on old code from linux-omap tree. The original driver was written
> > by Juha Yrjölä, Tony Lindgren, and Timo Teräs.
> > 
> > Signed-off-by: Aaro Koskinen <[e-mail]>
> 
> compile error:

[...]

> fixed it up with:
>
> diff --git a/drivers/usb/phy/phy-tahvo.c b/drivers/usb/phy/phy-tahvo.c
> index 7cf1766..8bb833e 100644
> --- a/drivers/usb/phy/phy-tahvo.c
> +++ b/drivers/usb/phy/phy-tahvo.c
> @@ -368,7 +368,9 @@ static int tahvo_usb_probe(struct platform_device *pdev)
>  
>  	tu->extcon.name = DRIVER_NAME;
>  	tu->extcon.supported_cable = tahvo_cable;
> -	ret = extcon_dev_register(&tu->extcon, &pdev->dev);
> +	tu->extcon.dev.parent = &pdev->dev;
> +
> +	ret = extcon_dev_register(&tu->extcon);
>  	if (ret) {
>  		dev_err(&pdev->dev, "could not register extcon device: %d\n",
>  			ret);
> 
> please make sure it still works with v3.13-rc2 + this patch.

Yes, that works fine with 3.13-rc2. Sorry for this, I was accidentally
testing & basing these patches on an old branch.

A.

Felipe Balbi Dec. 7, 2013, 5:51 p.m. UTC | #2

Hi,

On Sat, Dec 07, 2013 at 04:16:23PM +0200, Aaro Koskinen wrote:
> > fixed it up with:
> >
> > diff --git a/drivers/usb/phy/phy-tahvo.c b/drivers/usb/phy/phy-tahvo.c
> > index 7cf1766..8bb833e 100644
> > --- a/drivers/usb/phy/phy-tahvo.c
> > +++ b/drivers/usb/phy/phy-tahvo.c
> > @@ -368,7 +368,9 @@ static int tahvo_usb_probe(struct platform_device *pdev)
> >  
> >  	tu->extcon.name = DRIVER_NAME;
> >  	tu->extcon.supported_cable = tahvo_cable;
> > -	ret = extcon_dev_register(&tu->extcon, &pdev->dev);
> > +	tu->extcon.dev.parent = &pdev->dev;
> > +
> > +	ret = extcon_dev_register(&tu->extcon);
> >  	if (ret) {
> >  		dev_err(&pdev->dev, "could not register extcon device: %d\n",
> >  			ret);
> > 
> > please make sure it still works with v3.13-rc2 + this patch.
> 
> Yes, that works fine with 3.13-rc2. Sorry for this, I was accidentally

cool, thanks :-)

> testing & basing these patches on an old branch.

no problem, s**t happens to everybody :-)

Patch

diff --git a/drivers/usb/phy/phy-tahvo.c b/drivers/usb/phy/phy-tahvo.c
index 7cf1766..8bb833e 100644
--- a/drivers/usb/phy/phy-tahvo.c
+++ b/drivers/usb/phy/phy-tahvo.c
@@ -368,7 +368,9 @@  static int tahvo_usb_probe(struct platform_device *pdev)
 
 	tu->extcon.name = DRIVER_NAME;
 	tu->extcon.supported_cable = tahvo_cable;
-	ret = extcon_dev_register(&tu->extcon, &pdev->dev);
+	tu->extcon.dev.parent = &pdev->dev;
+
+	ret = extcon_dev_register(&tu->extcon);
 	if (ret) {
 		dev_err(&pdev->dev, "could not register extcon device: %d\n",
 			ret);