Skip to content

Commit

Permalink
usb: musb: drop board_set_vbus
Browse files Browse the repository at this point in the history
that's not used anymore. So let's drop it.

Signed-off-by: Felipe Balbi <balbi@ti.com>
  • Loading branch information
Felipe Balbi committed Dec 10, 2010
1 parent 7841737 commit 92b48df
Show file tree
Hide file tree
Showing 7 changed files with 0 additions and 15 deletions.
2 changes: 0 additions & 2 deletions drivers/usb/musb/am35x.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
1 change: 0 additions & 1 deletion drivers/usb/musb/blackfin.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 0 additions & 2 deletions drivers/usb/musb/da8xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
1 change: 0 additions & 1 deletion drivers/usb/musb/davinci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion drivers/usb/musb/musb_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions drivers/usb/musb/musb_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 0 additions & 3 deletions drivers/usb/musb/omap2430.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 92b48df

Please sign in to comment.