diff options
| author | Heikki Krogerus <heikki.krogerus@linux.intel.com> | 2014-12-04 11:54:43 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2014-12-10 22:37:20 -0500 |
| commit | 81e1dadfb5b2d47aa513ad60b1c9cf0ea17b6514 (patch) | |
| tree | 6ad9270c0b25c0afdcdae64d88daca7d10ec884a | |
| parent | 3ff67445750a84de67faaf52c6e1895cb09f2c56 (diff) | |
| download | linux-81e1dadfb5b2d47aa513ad60b1c9cf0ea17b6514.tar.gz linux-81e1dadfb5b2d47aa513ad60b1c9cf0ea17b6514.tar.bz2 linux-81e1dadfb5b2d47aa513ad60b1c9cf0ea17b6514.zip | |
arm: omap3: twl: remove usb phy init data
commit dbc98635e0d4 ("phy: remove the old lookup method") removes
struct phy_consumer but twl-common.c still uses the "phy_consumer"
structure resulting in the following compilation warning.
arch/arm/mach-omap2/twl-common.c:94:21: error: array type has
incomplete element type
struct phy_consumer consumers[] = {
Removed using phy_consumer since twl4030 uses the new lookup
method.
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
| -rw-r--r-- | arch/arm/mach-omap2/twl-common.c | 12 | ||||
| -rw-r--r-- | include/linux/i2c/twl.h | 2 |
2 files changed, 1 insertions, 13 deletions
diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c index b0d54dae1bcb..4457e731f7a4 100644 --- a/arch/arm/mach-omap2/twl-common.c +++ b/arch/arm/mach-omap2/twl-common.c @@ -91,18 +91,8 @@ void __init omap_pmic_late_init(void) } #if defined(CONFIG_ARCH_OMAP3) -struct phy_consumer consumers[] = { - PHY_CONSUMER("musb-hdrc.0", "usb"), -}; - -struct phy_init_data init_data = { - .consumers = consumers, - .num_consumers = ARRAY_SIZE(consumers), -}; - static struct twl4030_usb_data omap3_usb_pdata = { - .usb_mode = T2_USB_MODE_ULPI, - .init_data = &init_data, + .usb_mode = T2_USB_MODE_ULPI, }; static int omap3_batt_table[] = { diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h index 8cfb50f38529..0bc03f100d04 100644 --- a/include/linux/i2c/twl.h +++ b/include/linux/i2c/twl.h @@ -26,7 +26,6 @@ #define __TWL_H_ #include <linux/types.h> -#include <linux/phy/phy.h> #include <linux/input/matrix_keypad.h> /* @@ -634,7 +633,6 @@ enum twl4030_usb_mode { struct twl4030_usb_data { enum twl4030_usb_mode usb_mode; unsigned long features; - struct phy_init_data *init_data; int (*phy_init)(struct device *dev); int (*phy_exit)(struct device *dev); |