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

From: Felipe Balbi <[email-masked]>
Date: Mon, 16 Dec 2013 13:41:13 -0600

Hi,

On Mon, Dec 16, 2013 at 03:40:20PM +1100, Stephen Rothwell wrote:
> Hi Felipe,
> 
> After merging the usb-gadget tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/usb/phy/phy-keystone.c: In function 'keystone_usbphy_probe':
> drivers/usb/phy/phy-keystone.c:96:4: warning: passing argument 3 of 'usb_phy_gen_create_phy' makes pointer from integer without a cast [enabled by default]
>     USB_PHY_TYPE_USB2, 0, false);
>     ^
> In file included from drivers/usb/phy/phy-keystone.c:25:0:
> drivers/usb/phy/phy-generic.h:18:5: note: expected 'struct usb_phy_gen_xceiv_platform_data *' but argument is of type 'int'
>  int usb_phy_gen_create_phy(struct device *dev, struct usb_phy_gen_xceiv *nop,
>      ^
> drivers/usb/phy/phy-keystone.c:96:4: error: too many arguments to function 'usb_phy_gen_create_phy'
>     USB_PHY_TYPE_USB2, 0, false);
>     ^
> In file included from drivers/usb/phy/phy-keystone.c:25:0:
> drivers/usb/phy/phy-generic.h:18:5: note: declared here
>  int usb_phy_gen_create_phy(struct device *dev, struct usb_phy_gen_xceiv *nop,
>      ^
> 
> Caused by commit 25acdd08fd71 ("usb: phy: add Keystone usb phy driver")
> interacting with commit bd27fa44e138 ("usb: phy: add Keystone usb phy
> driver") which was merged before v3.13-rc1 and is included in the
> usb-gadget tree.

I cannot see how those commits would cause the error above. I have
recompiled my tree with allmodconfig (x86 and ARM) config and
omap2plus_defconfig (adding COMPILE_TEST and enabling KEYSTONE PHY) and
cannot see this error.

Maybe someone applied a drivers/usb/phy/ patch ahead of me ?

-- 
balbi