diff options
| author | Ruslan Bilovol <ruslan.bilovol@ti.com> | 2012-06-20 12:56:39 +0300 |
|---|---|---|
| committer | Ziyann <jaraidaniel@gmail.com> | 2014-10-01 12:59:40 +0200 |
| commit | 00741a7f703a2682eaf8b0d9bce63bd00aa4d6cd (patch) | |
| tree | 8ed3f6ef2e27a2338c907f46b84367f64e444f6d | |
| parent | a932c682d32ad7107a513a7e267ff04289c82a60 (diff) | |
| download | kernel_samsung_tuna-00741a7f703a2682eaf8b0d9bce63bd00aa4d6cd.zip kernel_samsung_tuna-00741a7f703a2682eaf8b0d9bce63bd00aa4d6cd.tar.gz kernel_samsung_tuna-00741a7f703a2682eaf8b0d9bce63bd00aa4d6cd.tar.bz2 | |
OMAP4: USB: remove unused function twl6030_set_phy_clk
This function is redundant and not used anywhere.
Remove it and change associated code accordingly
Change-Id: I06ba222429cfe89a401b426a211d1752e646450a
Signed-off-by: Ruslan Bilovol <ruslan.bilovol@ti.com>
Conflicts:
arch/arm/mach-omap2/board-44xx-power.c
arch/arm/mach-omap2/board-omap4panda.c
| -rw-r--r-- | arch/arm/mach-omap2/omap_phy_internal.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/usb.h | 1 | ||||
| -rw-r--r-- | drivers/usb/otg/twl6030-usb.c | 15 | ||||
| -rw-r--r-- | include/linux/i2c/twl.h | 2 |
4 files changed, 1 insertions, 19 deletions
diff --git a/arch/arm/mach-omap2/omap_phy_internal.c b/arch/arm/mach-omap2/omap_phy_internal.c index 052678e..50f81c7 100644 --- a/arch/arm/mach-omap2/omap_phy_internal.c +++ b/arch/arm/mach-omap2/omap_phy_internal.c @@ -185,7 +185,7 @@ static void omap44xx_hsotg_ed_correction(void) } #endif -int omap4430_phy_set_clk(struct device *dev, int on) +static int omap4430_phy_set_clk(struct device *dev, int on) { static int state; diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h index 422906a..feb834e 100644 --- a/arch/arm/plat-omap/include/plat/usb.h +++ b/arch/arm/plat-omap/include/plat/usb.h @@ -113,7 +113,6 @@ extern void usb_musb_init(struct omap_musb_board_data *board_data); extern void usbhs_init(const struct usbhs_omap_board_data *pdata); extern int omap4430_phy_power(struct device *dev, int ID, int on); -extern int omap4430_phy_set_clk(struct device *dev, int on); extern int omap4430_phy_init(struct device *dev); extern int omap4430_phy_exit(struct device *dev); extern int omap4_charger_detect(void); diff --git a/drivers/usb/otg/twl6030-usb.c b/drivers/usb/otg/twl6030-usb.c index bc3c65b6..d479acd 100644 --- a/drivers/usb/otg/twl6030-usb.c +++ b/drivers/usb/otg/twl6030-usb.c @@ -147,21 +147,6 @@ static inline u8 twl6030_readb(struct twl6030_usb *twl, u8 module, u8 address) } /*-------------------------------------------------------------------------*/ -static int twl6030_set_phy_clk(struct otg_transceiver *x, int on) -{ - struct twl6030_usb *twl; - struct device *dev; - struct twl4030_usb_data *pdata; - - twl = xceiv_to_twl(x); - dev = twl->dev; - pdata = dev->platform_data; - - pdata->phy_set_clock(twl->dev, on); - - return 0; -} - static int twl6030_phy_init(struct otg_transceiver *x) { struct twl6030_usb *twl; diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h index 8717499..2122bef 100644 --- a/include/linux/i2c/twl.h +++ b/include/linux/i2c/twl.h @@ -665,8 +665,6 @@ struct twl4030_usb_data { int (*phy_exit)(struct device *dev); /* Power on/off the PHY */ int (*phy_power)(struct device *dev, int iD, int on); - /* enable/disable phy clocks */ - int (*phy_set_clock)(struct device *dev, int on); /* suspend/resume of phy */ int (*phy_suspend)(struct device *dev, int suspend); }; |