Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Heikki Krogerus and committed by
Greg Kroah-Hartman
81e1dadf 3ff67445

+1 -13
+1 -11
arch/arm/mach-omap2/twl-common.c
··· 91 91 } 92 92 93 93 #if defined(CONFIG_ARCH_OMAP3) 94 - struct phy_consumer consumers[] = { 95 - PHY_CONSUMER("musb-hdrc.0", "usb"), 96 - }; 97 - 98 - struct phy_init_data init_data = { 99 - .consumers = consumers, 100 - .num_consumers = ARRAY_SIZE(consumers), 101 - }; 102 - 103 94 static struct twl4030_usb_data omap3_usb_pdata = { 104 - .usb_mode = T2_USB_MODE_ULPI, 105 - .init_data = &init_data, 95 + .usb_mode = T2_USB_MODE_ULPI, 106 96 }; 107 97 108 98 static int omap3_batt_table[] = {
-2
include/linux/i2c/twl.h
··· 26 26 #define __TWL_H_ 27 27 28 28 #include <linux/types.h> 29 - #include <linux/phy/phy.h> 30 29 #include <linux/input/matrix_keypad.h> 31 30 32 31 /* ··· 633 634 struct twl4030_usb_data { 634 635 enum twl4030_usb_mode usb_mode; 635 636 unsigned long features; 636 - struct phy_init_data *init_data; 637 637 638 638 int (*phy_init)(struct device *dev); 639 639 int (*phy_exit)(struct device *dev);