diff options
author | Felipe Balbi <balbi@ti.com> | 2010-12-02 07:30:06 -0500 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2010-12-10 03:21:33 -0500 |
commit | 92b48df24eec49ed1eb0ec9c5f6165d8282153ea (patch) | |
tree | 951957b0100b9c6dbb51003e9380bda7a2d9bbdc /drivers/usb | |
parent | 784173723e2fd23332af948a90612950964cd140 (diff) |
usb: musb: drop board_set_vbus
that's not used anymore. So let's drop it.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/musb/am35x.c | 2 | ||||
-rw-r--r-- | drivers/usb/musb/blackfin.c | 1 | ||||
-rw-r--r-- | drivers/usb/musb/da8xx.c | 2 | ||||
-rw-r--r-- | drivers/usb/musb/davinci.c | 1 | ||||
-rw-r--r-- | drivers/usb/musb/musb_core.c | 1 | ||||
-rw-r--r-- | drivers/usb/musb/musb_core.h | 5 | ||||
-rw-r--r-- | drivers/usb/musb/omap2430.c | 3 |
7 files changed, 0 insertions, 15 deletions
diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c index fdc7c8878f8b..62e65f0a7284 100644 --- a/drivers/usb/musb/am35x.c +++ b/drivers/usb/musb/am35x.c | |||
@@ -421,8 +421,6 @@ static int am35x_musb_init(struct musb *musb) | |||
421 | if (is_host_enabled(musb)) | 421 | if (is_host_enabled(musb)) |
422 | setup_timer(&otg_workaround, otg_timer, (unsigned long) musb); | 422 | setup_timer(&otg_workaround, otg_timer, (unsigned long) musb); |
423 | 423 | ||
424 | musb->board_set_vbus = am35x_musb_set_vbus; | ||
425 | |||
426 | /* Global reset */ | 424 | /* Global reset */ |
427 | sw_reset = omap_ctrl_readl(AM35XX_CONTROL_IP_SW_RESET); | 425 | sw_reset = omap_ctrl_readl(AM35XX_CONTROL_IP_SW_RESET); |
428 | 426 | ||
diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c index df0e906b1850..e72f762d214d 100644 --- a/drivers/usb/musb/blackfin.c +++ b/drivers/usb/musb/blackfin.c | |||
@@ -395,7 +395,6 @@ static int bfin_musb_init(struct musb *musb) | |||
395 | bfin_musb_reg_init(musb); | 395 | bfin_musb_reg_init(musb); |
396 | 396 | ||
397 | if (is_host_enabled(musb)) { | 397 | if (is_host_enabled(musb)) { |
398 | musb->board_set_vbus = bfin_musb_set_vbus; | ||
399 | setup_timer(&musb_conn_timer, | 398 | setup_timer(&musb_conn_timer, |
400 | musb_conn_timer_handler, (unsigned long) musb); | 399 | musb_conn_timer_handler, (unsigned long) musb); |
401 | } | 400 | } |
diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c index 387f4a75706f..69a0da3c8f09 100644 --- a/drivers/usb/musb/da8xx.c +++ b/drivers/usb/musb/da8xx.c | |||
@@ -437,8 +437,6 @@ static int da8xx_musb_init(struct musb *musb) | |||
437 | if (is_host_enabled(musb)) | 437 | if (is_host_enabled(musb)) |
438 | setup_timer(&otg_workaround, otg_timer, (unsigned long)musb); | 438 | setup_timer(&otg_workaround, otg_timer, (unsigned long)musb); |
439 | 439 | ||
440 | musb->board_set_vbus = da8xx_musb_set_vbus; | ||
441 | |||
442 | /* Reset the controller */ | 440 | /* Reset the controller */ |
443 | musb_writel(reg_base, DA8XX_USB_CTRL_REG, DA8XX_SOFT_RESET_MASK); | 441 | musb_writel(reg_base, DA8XX_USB_CTRL_REG, DA8XX_SOFT_RESET_MASK); |
444 | 442 | ||
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c index de67480d4f19..e6de097fb7e8 100644 --- a/drivers/usb/musb/davinci.c +++ b/drivers/usb/musb/davinci.c | |||
@@ -404,7 +404,6 @@ static int davinci_musb_init(struct musb *musb) | |||
404 | if (is_host_enabled(musb)) | 404 | if (is_host_enabled(musb)) |
405 | setup_timer(&otg_workaround, otg_timer, (unsigned long) musb); | 405 | setup_timer(&otg_workaround, otg_timer, (unsigned long) musb); |
406 | 406 | ||
407 | musb->board_set_vbus = davinci_musb_set_vbus; | ||
408 | davinci_musb_source_power(musb, 0, 1); | 407 | davinci_musb_source_power(musb, 0, 1); |
409 | 408 | ||
410 | /* dm355 EVM swaps D+/D- for signal integrity, and | 409 | /* dm355 EVM swaps D+/D- for signal integrity, and |
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c index e24bb41df1dc..325d7acafdf9 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c | |||
@@ -2000,7 +2000,6 @@ bad_config: | |||
2000 | * - may initialize an integrated tranceiver | 2000 | * - may initialize an integrated tranceiver |
2001 | * - initializes musb->xceiv, usually by otg_get_transceiver() | 2001 | * - initializes musb->xceiv, usually by otg_get_transceiver() |
2002 | * - stops powering VBUS | 2002 | * - stops powering VBUS |
2003 | * - assigns musb->board_set_vbus if host mode is enabled | ||
2004 | * | 2003 | * |
2005 | * There are various transciever configurations. Blackfin, | 2004 | * There are various transciever configurations. Blackfin, |
2006 | * DaVinci, TUSB60x0, and others integrate them. OMAP3 uses | 2005 | * DaVinci, TUSB60x0, and others integrate them. OMAP3 uses |
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h index 9a3c71fce2b4..b9ea563d1c8e 100644 --- a/drivers/usb/musb/musb_core.h +++ b/drivers/usb/musb/musb_core.h | |||
@@ -412,11 +412,6 @@ struct musb { | |||
412 | struct timer_list otg_timer; | 412 | struct timer_list otg_timer; |
413 | #endif | 413 | #endif |
414 | 414 | ||
415 | /* called with IRQs blocked; ON/nonzero implies starting a session, | ||
416 | * and waiting at least a_wait_vrise_tmout. | ||
417 | */ | ||
418 | void (*board_set_vbus)(struct musb *, int is_on); | ||
419 | |||
420 | struct dma_controller *dma_controller; | 415 | struct dma_controller *dma_controller; |
421 | 416 | ||
422 | struct device *controller; | 417 | struct device *controller; |
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c index 5939823990c9..0a7e6824eae8 100644 --- a/drivers/usb/musb/omap2430.c +++ b/drivers/usb/musb/omap2430.c | |||
@@ -268,9 +268,6 @@ static int omap2430_musb_init(struct musb *musb) | |||
268 | musb_readl(musb->mregs, OTG_INTERFSEL), | 268 | musb_readl(musb->mregs, OTG_INTERFSEL), |
269 | musb_readl(musb->mregs, OTG_SIMENABLE)); | 269 | musb_readl(musb->mregs, OTG_SIMENABLE)); |
270 | 270 | ||
271 | if (is_host_enabled(musb)) | ||
272 | musb->board_set_vbus = omap2430_musb_set_vbus; | ||
273 | |||
274 | setup_timer(&musb_idle_timer, musb_do_idle, (unsigned long) musb); | 271 | setup_timer(&musb_idle_timer, musb_do_idle, (unsigned long) musb); |
275 | 272 | ||
276 | return 0; | 273 | return 0; |