diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c index fdc7c8878f8b0764ab75740df48623c4cd77c137..62e65f0a72847be6c5ec88e3566781c23e7e888d 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 df0e906b1850c7a84007eb808303d9b89a68cc79..e72f762d214d46e65080c0cab3b9d8d1cbacc08e 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 387f4a75706f5bbbad6d4e810028e07c485a517c..69a0da3c8f09b4b25887af382eb6eb1b33daa5d6 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 de67480d4f19660512d81f1652a941815cefbd97..e6de097fb7e823c8d5b663d0efc22e3e0276d717 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 e24bb41df1dcd16a3943554ea347327eab78c03e..325d7acafdf9777eed834de44f279c55925de4f5 100644 --- a/drivers/usb/musb/musb_core.c +++ b/drivers/usb/musb/musb_core.c @@ -2000,7 +2000,6 @@ musb_init_controller(struct device *dev, int nIrq, void __iomem *ctrl) * - 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 9a3c71fce2b438a87b6fc9e4de71478e394d9242..b9ea563d1c8edf5975a9403844be19072255b36f 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 5939823990c93150bd5651ed11b5dd8a5b22045a..0a7e6824eae8902da6007cbf7923f980a9e0bad2 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;