Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81e1dadf authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Greg Kroah-Hartman
Browse files

arm: omap3: twl: remove usb phy init data 



commit dbc98635 ("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: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent 3ff67445

arch/arm/mach-omap2/twl-common.c

+1 −11
Original line number Diff line number Diff line
@@ -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,

};



static int omap3_batt_table[] = {

include/linux/i2c/twl.h

+0 −2
Original line number Diff line number Diff line
@@ -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);