usb: musb: Remove board_data parameter from musb_platform_init()

PATCH In review Hema HK 5 participants 8 messages Sep 22, 2010 – Dec 12, 2010 7 messages not in the archive

Subsystems (3)

USB MUSB multipoint high speed dual-role controller OMAP USB support

lore

Share & tools

lore

Hema HK

author

2010-09-22 14:57 UTC #0 lore raw

PATCH v3 2/9 usb: musb: Remove board_data parameter from musb_platform_init()

Removed the board_data parameter being passed to musb_platform_init function as board data can be extracted from device structure which is already member of musb structure.

Signed-off-by Hema HK <[email protected]>

Cc Felipe Balbi <[email protected]>

Cc Tony Lindgren <[email protected]>

Cc Kevin Hilman <[email protected]>

Cc Cousson, Benoit <[email protected]>

Cc Paul Walmsley <[email protected]>

---
 drivers/usb/musb/blackfin.c  |    2 +-
 drivers/usb/musb/davinci.c   |    2 +-
 drivers/usb/musb/musb_core.c |    2 +-
 drivers/usb/musb/musb_core.h |    2 +-
 drivers/usb/musb/omap2430.c  |    6 ++++--
 drivers/usb/musb/tusb6010.c  |    2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)

drivers/usb/musb/blackfin.c +1 -1

Index: linux-omap-pm/drivers/usb/musb/blackfin.c
===================================================================
@@ -323,7 +323,7 @@ int musb_platform_set_mode(struct musb *
 	return -EIO;
 }
 
-int __init musb_platform_init(struct musb *musb, void *board_data)
+int __init musb_platform_init(struct musb *musb)
 {
 
 	/*

drivers/usb/musb/davinci.c +1 -1

Index: linux-omap-pm/drivers/usb/musb/davinci.c
===================================================================
@@ -376,7 +376,7 @@ int musb_platform_set_mode(struct musb *
 	return -EIO;
 }
 
-int __init musb_platform_init(struct musb *musb, void *board_data)
+int __init musb_platform_init(struct musb *musb)
 {
 	void __iomem	*tibase = musb->ctrl_base;
 	u32		revision;

drivers/usb/musb/musb_core.c +1 -1

Index: linux-omap-pm/drivers/usb/musb/musb_core.c
===================================================================
@@ -2022,7 +2022,7 @@ bad_config:
 	 * isp1504, non-OTG, etc) mostly hooking up through ULPI.
 	 */
 	musb->isr = generic_interrupt;
-	status = musb_platform_init(musb, plat->board_data);
+	status = musb_platform_init(musb);
 	if (status < 0)
 		goto fail2;

drivers/usb/musb/musb_core.h +1 -1

Index: linux-omap-pm/drivers/usb/musb/musb_core.h
===================================================================
@@ -612,7 +612,7 @@ extern int musb_platform_get_vbus_status
 #define musb_platform_get_vbus_status(x)	0
 #endif
 
-extern int __init musb_platform_init(struct musb *musb, void *board_data);
+extern int __init musb_platform_init(struct musb *musb);
 extern int musb_platform_exit(struct musb *musb);
 
 #endif	/* __MUSB_CORE_H__ */

drivers/usb/musb/omap2430.c +4 -2

Index: linux-omap-pm/drivers/usb/musb/omap2430.c
===================================================================
@@ -187,10 +187,12 @@ int musb_platform_set_mode(struct musb *
 	return 0;
 }
 
-int __init musb_platform_init(struct musb *musb, void *board_data)
+int __init musb_platform_init(struct musb *musb)
 {
 	u32 l;
-	struct omap_musb_board_data *data = board_data;
+	struct device *dev = musb->controller;
+	struct musb_hdrc_platform_data *plat = dev->platform_data;
+	struct omap_musb_board_data *data = plat->board_data;
 
 	/* We require some kind of external transceiver, hooked
 	 * up through ULPI.  TWL4030-family PMICs include one,

drivers/usb/musb/tusb6010.c +1 -1

Index: linux-omap-pm/drivers/usb/musb/tusb6010.c
===================================================================
@@ -1091,7 +1091,7 @@ err:
 	return -ENODEV;
 }
 
-int __init musb_platform_init(struct musb *musb, void *board_data)
+int __init musb_platform_init(struct musb *musb)
 {
 	struct platform_device	*pdev;
 	struct resource		*mem;

Kalliguddi, Hema

author

2010-09-29 07:00 UTC #1 lore raw

Hi,

Quoted 109 lines

-----Original Message-----
From: Kalliguddi, Hema
Sent: Thursday, September 23, 2010 5:58 AM
To: [email protected]; [email protected]
Cc: Kalliguddi, Hema; Balbi, Felipe; Tony Lindgren; Kevin Hilman; Cousson, Benoit; Paul Walmsley
Subject: [PATCH 2/9 v3] usb: musb: Remove board_data parameter from musb_platform_init()
Removed the board_data parameter being passed to musb_platform_init function
as board data can be extracted from device structure which is already member of
musb structure.
Signed-off-by Hema HK <[email protected]>
Cc Felipe Balbi <[email protected]>
Cc Tony Lindgren <[email protected]>
Cc Kevin Hilman <[email protected]>
Cc Cousson, Benoit <[email protected]>
Cc Paul Walmsley <[email protected]>
---
drivers/usb/musb/blackfin.c  |    2 +-
drivers/usb/musb/davinci.c   |    2 +-
drivers/usb/musb/musb_core.c |    2 +-
drivers/usb/musb/musb_core.h |    2 +-
drivers/usb/musb/omap2430.c  |    6 ++++--
drivers/usb/musb/tusb6010.c  |    2 +-
6 files changed, 9 insertions(+), 7 deletions(-)
Index: linux-omap-pm/drivers/usb/musb/blackfin.c
===================================================================
drivers/usb/musb/blackfin.c +1 -1
@@ -323,7 +323,7 @@ int musb_platform_set_mode(struct musb *
 	return -EIO;
 }
 
-int __init musb_platform_init(struct musb *musb, void *board_data)
+int __init musb_platform_init(struct musb *musb)
 {
 
 	/*
Index: linux-omap-pm/drivers/usb/musb/davinci.c
===================================================================
drivers/usb/musb/davinci.c +1 -1
@@ -376,7 +376,7 @@ int musb_platform_set_mode(struct musb *
 	return -EIO;
 }
 
-int __init musb_platform_init(struct musb *musb, void *board_data)
+int __init musb_platform_init(struct musb *musb)
 {
 	void __iomem	*tibase = musb->ctrl_base;
 	u32		revision;
Index: linux-omap-pm/drivers/usb/musb/musb_core.c
===================================================================
drivers/usb/musb/musb_core.c +1 -1
@@ -2022,7 +2022,7 @@ bad_config:
 	 * isp1504, non-OTG, etc) mostly hooking up through ULPI.
 	 */
 	musb->isr = generic_interrupt;
-	status = musb_platform_init(musb, plat->board_data);
+	status = musb_platform_init(musb);
 	if (status < 0)
 		goto fail2;
 
Index: linux-omap-pm/drivers/usb/musb/musb_core.h
===================================================================
drivers/usb/musb/musb_core.h +1 -1
@@ -612,7 +612,7 @@ extern int musb_platform_get_vbus_status
 #define musb_platform_get_vbus_status(x)	0
 #endif
 
-extern int __init musb_platform_init(struct musb *musb, void 
 *board_data);
+extern int __init musb_platform_init(struct musb *musb);
 extern int musb_platform_exit(struct musb *musb);
 
#endif /* __MUSB_CORE_H__ */
Index: linux-omap-pm/drivers/usb/musb/omap2430.c
===================================================================
drivers/usb/musb/omap2430.c +4 -2
@@ -187,10 +187,12 @@ int musb_platform_set_mode(struct musb *
 	return 0;
 }
 
-int __init musb_platform_init(struct musb *musb, void *board_data)
+int __init musb_platform_init(struct musb *musb)
 {
 	u32 l;
-	struct omap_musb_board_data *data = board_data;
+	struct device *dev = musb->controller;
+	struct musb_hdrc_platform_data *plat = dev->platform_data;
+	struct omap_musb_board_data *data = plat->board_data;
 
 	/* We require some kind of external transceiver, hooked
 	 * up through ULPI.  TWL4030-family PMICs include one,
Index: linux-omap-pm/drivers/usb/musb/tusb6010.c
===================================================================

drivers/usb/musb/tusb6010.c err: · line 1097

Quoted 8 lines

drivers/usb/musb/tusb6010.c +1 -1

@@ -1091,7 +1091,7 @@ err:
 	return -ENODEV;
 }
 
-int __init musb_platform_init(struct musb *musb, void *board_data)
+int __init musb_platform_init(struct musb *musb)
 {
 	struct platform_device	*pdev;
 	struct resource		*mem;

Any comments on this patch?

Regards,
Hema

A message that is not in the archive (sent off-list or not yet received): E0D41E29EB0DAC4E9F3FF173962E9E9402DB7FE390-/tLxBxkBPtCIQmiDNMet8wC/[email protected]

Felipe Balbi

2010-09-29 07:02 UTC #3 lore raw

Hi,

Quoted 1 line · Hema

Any comments on this patch?

I need an ack from Mike (blackfin) and Kevin (DaVinci). Everything else is fine by me.

Signature · 5 lines

balbi
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): 1285201660-26309-1-git-send-email-hemahk-l0cyMroinI0@public.gmane.org

Kevin Hilman

Acked-by

2010-09-29 14:41 UTC #5 lore raw

Quoted 10 lines · Hema HK

Removed the board_data parameter being passed to musb_platform_init function as board data can be extracted from device structure which is already member of musb structure.
Signed-off-by Hema HK <[email protected]>
Cc Felipe Balbi <[email protected]>
Cc Tony Lindgren <[email protected]>
Cc Kevin Hilman <[email protected]>
Cc Cousson, Benoit <[email protected]>
Cc Paul Walmsley <[email protected]>

For the davinci changes:

Acked-by Kevin Hilman <[email protected]>

Kevin

Quoted 85 lines

---
 drivers/usb/musb/blackfin.c  |    2 +-
 drivers/usb/musb/davinci.c   |    2 +-
 drivers/usb/musb/musb_core.c |    2 +-
 drivers/usb/musb/musb_core.h |    2 +-
 drivers/usb/musb/omap2430.c  |    6 ++++--
 drivers/usb/musb/tusb6010.c  |    2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)

Index: linux-omap-pm/drivers/usb/musb/blackfin.c
===================================================================

drivers/usb/musb/blackfin.c +1 -1

@@ -323,7 +323,7 @@ int musb_platform_set_mode(struct musb *
 	return -EIO;
 }
 
-int __init musb_platform_init(struct musb *musb, void *board_data)
+int __init musb_platform_init(struct musb *musb)
 {
 
 	/*

Index: linux-omap-pm/drivers/usb/musb/davinci.c
===================================================================

drivers/usb/musb/davinci.c +1 -1

@@ -376,7 +376,7 @@ int musb_platform_set_mode(struct musb *
 	return -EIO;
 }
 
-int __init musb_platform_init(struct musb *musb, void *board_data)
+int __init musb_platform_init(struct musb *musb)
 {
 	void __iomem	*tibase = musb->ctrl_base;
 	u32		revision;

Index: linux-omap-pm/drivers/usb/musb/musb_core.c
===================================================================

drivers/usb/musb/musb_core.c +1 -1

@@ -2022,7 +2022,7 @@ bad_config:
 	 * isp1504, non-OTG, etc) mostly hooking up through ULPI.
 	 */
 	musb->isr = generic_interrupt;
-	status = musb_platform_init(musb, plat->board_data);
+	status = musb_platform_init(musb);
 	if (status < 0)
 		goto fail2;

Index: linux-omap-pm/drivers/usb/musb/musb_core.h
===================================================================

drivers/usb/musb/musb_core.h +1 -1

@@ -612,7 +612,7 @@ extern int musb_platform_get_vbus_status
 #define musb_platform_get_vbus_status(x)	0
 #endif
 
-extern int __init musb_platform_init(struct musb *musb, void *board_data);
+extern int __init musb_platform_init(struct musb *musb);
 extern int musb_platform_exit(struct musb *musb);
 
 #endif	/* __MUSB_CORE_H__ */

Index: linux-omap-pm/drivers/usb/musb/omap2430.c
===================================================================

drivers/usb/musb/omap2430.c +4 -2

@@ -187,10 +187,12 @@ int musb_platform_set_mode(struct musb *
 	return 0;
 }
 
-int __init musb_platform_init(struct musb *musb, void *board_data)
+int __init musb_platform_init(struct musb *musb)
 {
 	u32 l;
-	struct omap_musb_board_data *data = board_data;
+	struct device *dev = musb->controller;
+	struct musb_hdrc_platform_data *plat = dev->platform_data;
+	struct omap_musb_board_data *data = plat->board_data;
 
 	/* We require some kind of external transceiver, hooked
 	 * up through ULPI.  TWL4030-family PMICs include one,

Index: linux-omap-pm/drivers/usb/musb/tusb6010.c
===================================================================

drivers/usb/musb/tusb6010.c err: · line 1097

Quoted 8 lines

drivers/usb/musb/tusb6010.c +1 -1

@@ -1091,7 +1091,7 @@ err:
 	return -ENODEV;
 }
 
-int __init musb_platform_init(struct musb *musb, void *board_data)
+int __init musb_platform_init(struct musb *musb)
 {
 	struct platform_device	*pdev;
 	struct resource		*mem;

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): [email protected]

Sergei Shtylyov

2010-12-10 19:30 UTC #7 lore raw

Hello.

Quoted 11 lines · Kevin Hilman

Quoted 10 lines
Removed the board_data parameter being passed to musb_platform_init function as board data can be extracted from device structure which is already member of musb structure.
Signed-off-by Hema HK <[email protected]>
Cc Felipe Balbi <[email protected]>
Cc Tony Lindgren <[email protected]>
Cc Kevin Hilman <[email protected]>
Cc Cousson, Benoit <[email protected]>
Cc Paul Walmsley <[email protected]>

Quoted 14 lines

For the davinci changes:

Acked-by Kevin Hilman <[email protected]>

Kevin

Quoted 8 lines

---
 drivers/usb/musb/blackfin.c  |    2 +-
 drivers/usb/musb/davinci.c   |    2 +-
 drivers/usb/musb/musb_core.c |    2 +-
 drivers/usb/musb/musb_core.h |    2 +-
 drivers/usb/musb/omap2430.c  |    6 ++++--
 drivers/usb/musb/tusb6010.c  |    2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)

Grr. This misses changes to da8xx.c and am35x.c -- which breaks the
compilation for them!
Greg, could you drop it from your usb-next branch? Or should we send a patch
adding these glue layers?

WBR. Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Greg KH

2010-12-10 20:30 UTC #8 lore raw

Quoted 30 lines · Sergei Shtylyov

Hello.
Quoted 11 lines · Kevin Hilman
Quoted 10 lines
Removed the board_data parameter being passed to musb_platform_init function as board data can be extracted from device structure which is already member of musb structure.
Signed-off-by Hema HK <[email protected]>
Cc Felipe Balbi <[email protected]>
Cc Tony Lindgren <[email protected]>
Cc Kevin Hilman <[email protected]>
Cc Cousson, Benoit <[email protected]>
Cc Paul Walmsley <[email protected]>
Quoted 14 lines
For the davinci changes:
Acked-by Kevin Hilman <[email protected]>
Kevin
Quoted 8 lines
---
drivers/usb/musb/blackfin.c  |    2 +-
drivers/usb/musb/davinci.c   |    2 +-
drivers/usb/musb/musb_core.c |    2 +-
drivers/usb/musb/musb_core.h |    2 +-
drivers/usb/musb/omap2430.c  |    6 ++++--
drivers/usb/musb/tusb6010.c  |    2 +-
6 files changed, 9 insertions(+), 7 deletions(-)

Quoted 4 lines

Grr. This misses changes to da8xx.c and am35x.c -- which breaks
the compilation for them!
Greg, could you drop it from your usb-next branch? Or should we
send a patch adding these glue layers?

I can't drop patches from a git branch, sorry, it doesn't work that way anymore.

greg k-h

A message that is not in the archive (sent off-list or not yet received): [email protected]

Sergei Shtylyov

2010-12-10 21:07 UTC #10 lore raw

Hello.

Quoted 25 lines · Greg KH

Quoted 24 lines
Quoted 24 lines
Quoted 10 lines
Removed the board_data parameter being passed to musb_platform_init function as board data can be extracted from device structure which is already member of musb structure.
Signed-off-by Hema HK <[email protected]>
Cc Felipe Balbi <[email protected]>
Cc Tony Lindgren <[email protected]>
Cc Kevin Hilman <[email protected]>
Cc Cousson, Benoit <[email protected]>
Cc Paul Walmsley <[email protected]>
For the davinci changes:
Acked-by Kevin Hilman <[email protected]>
Kevin
Quoted 8 lines
---
drivers/usb/musb/blackfin.c  |    2 +-
drivers/usb/musb/davinci.c   |    2 +-
drivers/usb/musb/musb_core.c |    2 +-
drivers/usb/musb/musb_core.h |    2 +-
drivers/usb/musb/omap2430.c  |    6 ++++--
drivers/usb/musb/tusb6010.c  |    2 +-
6 files changed, 9 insertions(+), 7 deletions(-)

Quoted 7 lines

Quoted 4 lines
Grr. This misses changes to da8xx.c and am35x.c -- which breaks
the compilation for them!
Greg, could you drop it from your usb-next branch? Or should we
send a patch adding these glue layers?
I can't drop patches from a git branch, sorry, it doesn't work that way anymore.

That's why I really prefer quilt to git. :-)

Quoted 1 line

greg k-h

WBR, Sergei
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): [email protected]

Sergei Shtylyov

2010-12-12 13:55 UTC #14 lore raw

Hello.

Quoted 31 lines · Greg KH

Quoted 30 lines
Quoted 30 lines
Quoted 30 lines
Quoted 11 lines
Quoted 10 lines
Removed the board_data parameter being passed to musb_platform_init function as board data can be extracted from device structure which is already member of musb structure.
Signed-off-by Hema HK<[email protected]>
Cc Felipe Balbi<[email protected]>
Cc Tony Lindgren<[email protected]>
Cc Kevin Hilman<[email protected]>
Cc Cousson, Benoit<[email protected]>
Cc Paul Walmsley<[email protected]>
Quoted 14 lines
For the davinci changes:
Acked-by Kevin Hilman<[email protected]>
Kevin
Quoted 8 lines
---
drivers/usb/musb/blackfin.c  |    2 +-
drivers/usb/musb/davinci.c   |    2 +-
drivers/usb/musb/musb_core.c |    2 +-
drivers/usb/musb/musb_core.h |    2 +-
drivers/usb/musb/omap2430.c  |    6 ++++--
drivers/usb/musb/tusb6010.c  |    2 +-
6 files changed, 9 insertions(+), 7 deletions(-)
Grr. This misses changes to da8xx.c and am35x.c -- which breaks
the compilation for them!
Greg, could you drop it from your usb-next branch? Or should we
send a patch adding these glue layers?

Quoted 8 lines

Quoted 5 lines
Quoted 2 lines
I can't drop patches from a git branch, sorry, it doesn't work that way anymore.
OTOH, you could revert it (as breaking the build). Dunno if that
makes sense...
Again, I trust the musb maintainer here to handle this type of thing, not me. So take it up with him.

Done already. And he's on the CC here too...

Quoted 3 lines

thanks,
greg k-h

WBR, Sergei
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html