summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2010-12-02 15:30:06 +0300
committerFelipe Balbi <balbi@ti.com>2010-12-10 11:21:33 +0300
commit92b48df24eec49ed1eb0ec9c5f6165d8282153ea (patch)
tree951957b0100b9c6dbb51003e9380bda7a2d9bbdc
parent784173723e2fd23332af948a90612950964cd140 (diff)
downloadlinux-92b48df24eec49ed1eb0ec9c5f6165d8282153ea.tar.xz
usb: musb: drop board_set_vbus
that's not used anymore. So let's drop it. Signed-off-by: Felipe Balbi <balbi@ti.com>
-rw-r--r--drivers/usb/musb/am35x.c2
-rw-r--r--drivers/usb/musb/blackfin.c1
-rw-r--r--drivers/usb/musb/da8xx.c2
-rw-r--r--drivers/usb/musb/davinci.c1
-rw-r--r--drivers/usb/musb/musb_core.c1
-rw-r--r--drivers/usb/musb/musb_core.h5
-rw-r--r--drivers/usb/musb/omap2430.c3
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)
if (is_host_enabled(musb))
setup_timer(&otg_workaround, otg_timer, (unsigned long) musb);
- musb->board_set_vbus = am35x_musb_set_vbus;
-
/* Global reset */
sw_reset = omap_ctrl_readl(AM35XX_CONTROL_IP_SW_RESET);
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)
bfin_musb_reg_init(musb);
if (is_host_enabled(musb)) {
- musb->board_set_vbus = bfin_musb_set_vbus;
setup_timer(&musb_conn_timer,
musb_conn_timer_handler, (unsigned long) musb);
}
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)
if (is_host_enabled(musb))
setup_timer(&otg_workaround, otg_timer, (unsigned long)musb);
- musb->board_set_vbus = da8xx_musb_set_vbus;
-
/* Reset the controller */
musb_writel(reg_base, DA8XX_USB_CTRL_REG, DA8XX_SOFT_RESET_MASK);
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)
if (is_host_enabled(musb))
setup_timer(&otg_workaround, otg_timer, (unsigned long) musb);
- musb->board_set_vbus = davinci_musb_set_vbus;
davinci_musb_source_power(musb, 0, 1);
/* 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:
* - may initialize an integrated tranceiver
* - initializes musb->xceiv, usually by otg_get_transceiver()
* - stops powering VBUS
- * - assigns musb->board_set_vbus if host mode is enabled
*
* There are various transciever configurations. Blackfin,
* 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 {
struct timer_list otg_timer;
#endif
- /* called with IRQs blocked; ON/nonzero implies starting a session,
- * and waiting at least a_wait_vrise_tmout.
- */
- void (*board_set_vbus)(struct musb *, int is_on);
-
struct dma_controller *dma_controller;
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)
musb_readl(musb->mregs, OTG_INTERFSEL),
musb_readl(musb->mregs, OTG_SIMENABLE));
- if (is_host_enabled(musb))
- musb->board_set_vbus = omap2430_musb_set_vbus;
-
setup_timer(&musb_idle_timer, musb_do_idle, (unsigned long) musb);
return 0;