linux-next: build failure after merge of the usb tree

linux-next: build failure after merge of the usb tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 463 bytes --]

Hi Greg,

After merging the usb tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

arch/arm/mach-omap2/twl-common.c:94:21: error: array type has incomplete element type
 struct phy_consumer consumers[] = {
                     ^

Caused by commit dbc98635e0d4 ("phy: remove the old lookup method").

I have used the usb tree from next-20141128 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: linux-next: build failure after merge of the usb tree

[Greg KH]

On Mon, Dec 01, 2014 at 07:19:23PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> After merging the usb tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> arch/arm/mach-omap2/twl-common.c:94:21: error: array type has incomplete element type
>  struct phy_consumer consumers[] = {
>                      ^
> 
> Caused by commit dbc98635e0d4 ("phy: remove the old lookup method").
> 
> I have used the usb tree from next-20141128 for today.

Ick, Heikki and Kishon, do you want me to just revert this patch?  How
did you test it?

greg k-h

Re: linux-next: build failure after merge of the usb tree

[Kishon Vijay Abraham I]

Greg,

On Tuesday 02 December 2014 11:42 PM, Greg KH wrote:
> On Mon, Dec 01, 2014 at 07:19:23PM +1100, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> After merging the usb tree, today's linux-next build (arm
>> multi_v7_defconfig) failed like this:
>>
>> arch/arm/mach-omap2/twl-common.c:94:21: error: array type has incomplete element type
>>  struct phy_consumer consumers[] = {
>>                      ^
>>
>> Caused by commit dbc98635e0d4 ("phy: remove the old lookup method").
>>
>> I have used the usb tree from next-20141128 for today.
> 
> Ick, Heikki and Kishon, do you want me to just revert this patch?  How
> did you test it?

I've resent the patch "arm: omap3: twl: remove usb phy init data" which is
needed to get rid of this error.

This patch was part of the original series sent by Heikki but I couldn't merge
it since I didn't get Ack from tony since it touched arch/arm/mach-omap2/ file.
And I clearly missed the build failure report from fengguang. Sorry.

Thanks
Kishon

[PATCH v2] arm: omap3: twl: remove usb phy init data

[Kishon Vijay Abraham I]

From: Heikki Krogerus <heikki.krogerus@linux.intel.com>

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>
---
Changes from v1:
Fixed the commit log.
 arch/arm/mach-omap2/twl-common.c |   12 +-----------
 include/linux/i2c/twl.h          |    2 --
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c
index b0d54da..4457e73 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 8cfb50f..0bc03f1 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);
-- 
1.7.9.5