From mboxrd@z Thu Jan 1 00:00:00 1970 From: Greg KH Subject: Re: linux-next: build failure after merge of the usb tree Date: Thu, 24 Jul 2014 00:44:52 -0700 Message-ID: <20140724074452.GB11963@kroah.com> References: <20140724170755.035cea1c@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from out2-smtp.messagingengine.com ([66.111.4.26]:50490 "EHLO out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934228AbaGXHpT (ORCPT ); Thu, 24 Jul 2014 03:45:19 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by gateway1.nyi.internal (Postfix) with ESMTP id 6031821022 for ; Thu, 24 Jul 2014 03:45:18 -0400 (EDT) Content-Disposition: inline In-Reply-To: <20140724170755.035cea1c@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Olof Johansson , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Pratyush Anand , Viresh Kumar , Thierry Reding On Thu, Jul 24, 2014 at 05:07:55PM +1000, Stephen Rothwell wrote: > Hi Greg, > > After merging the usb tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > drivers/phy/phy-spear1310-miphy.c: In function 'spear1310_miphy_probe': > drivers/phy/phy-spear1310-miphy.c:232:14: warning: passing argument 2 of 'devm_phy_create' from incompatible pointer type > priv->phy = devm_phy_create(dev, &spear1310_miphy_ops, NULL); > ^ > In file included from drivers/phy/phy-spear1310-miphy.c:21:0: > include/linux/phy/phy.h:164:13: note: expected 'struct device_node *' but argument is of type 'struct phy_ops *' > struct phy *devm_phy_create(struct device *dev, struct device_node *node, > ^ > drivers/phy/phy-spear1310-miphy.c:232:14: error: too few arguments to function 'devm_phy_create' > priv->phy = devm_phy_create(dev, &spear1310_miphy_ops, NULL); > ^ > In file included from drivers/phy/phy-spear1310-miphy.c:21:0: > include/linux/phy/phy.h:164:13: note: declared here > struct phy *devm_phy_create(struct device *dev, struct device_node *node, > ^ > drivers/phy/phy-spear1340-miphy.c: In function 'spear1340_miphy_probe': > drivers/phy/phy-spear1340-miphy.c:264:14: warning: passing argument 2 of 'devm_phy_create' from incompatible pointer type > priv->phy = devm_phy_create(dev, &spear1340_miphy_ops, NULL); > ^ > In file included from drivers/phy/phy-spear1340-miphy.c:21:0: > include/linux/phy/phy.h:164:13: note: expected 'struct device_node *' but argument is of type 'struct phy_ops *' > struct phy *devm_phy_create(struct device *dev, struct device_node *node, > ^ > drivers/phy/phy-spear1340-miphy.c:264:14: error: too few arguments to function 'devm_phy_create' > priv->phy = devm_phy_create(dev, &spear1340_miphy_ops, NULL); > ^ > In file included from drivers/phy/phy-spear1340-miphy.c:21:0: > include/linux/phy/phy.h:164:13: note: declared here > struct phy *devm_phy_create(struct device *dev, struct device_node *node, > ^ > > Caused by commit f0ed817638b5 ("phy: core: Let node ptr of PHY point to > PHY and not of PHY provider") interacting with commit 64562e99477f > ("phy: Add drivers for PCIe and SATA phy on SPEAr13xx") from the > arm-soc tree. > > I fixed that up and then got: > > drivers/pinctrl/pinctrl-tegra-xusb.c: In function 'tegra_xusb_padctl_probe': > drivers/pinctrl/pinctrl-tegra-xusb.c:913:8: warning: passing argument 2 of 'devm_phy_create' from incompatible pointer type > phy = devm_phy_create(&pdev->dev, &pcie_phy_ops, NULL); > ^ > In file included from drivers/pinctrl/pinctrl-tegra-xusb.c:18:0: > include/linux/phy/phy.h:164:13: note: expected 'struct device_node *' but argument is of type 'const struct phy_ops *' > struct phy *devm_phy_create(struct device *dev, struct device_node *node, > ^ > drivers/pinctrl/pinctrl-tegra-xusb.c:913:8: error: too few arguments to function 'devm_phy_create' > phy = devm_phy_create(&pdev->dev, &pcie_phy_ops, NULL); > ^ > In file included from drivers/pinctrl/pinctrl-tegra-xusb.c:18:0: > include/linux/phy/phy.h:164:13: note: declared here > struct phy *devm_phy_create(struct device *dev, struct device_node *node, > ^ > drivers/pinctrl/pinctrl-tegra-xusb.c:922:8: warning: passing argument 2 of 'devm_phy_create' from incompatible pointer type > phy = devm_phy_create(&pdev->dev, &sata_phy_ops, NULL); > ^ > In file included from drivers/pinctrl/pinctrl-tegra-xusb.c:18:0: > include/linux/phy/phy.h:164:13: note: expected 'struct device_node *' but argument is of type 'const struct phy_ops *' > struct phy *devm_phy_create(struct device *dev, struct device_node *node, > ^ > drivers/pinctrl/pinctrl-tegra-xusb.c:922:8: error: too few arguments to function 'devm_phy_create' > phy = devm_phy_create(&pdev->dev, &sata_phy_ops, NULL); > ^ > In file included from drivers/pinctrl/pinctrl-tegra-xusb.c:18:0: > include/linux/phy/phy.h:164:13: note: declared here > struct phy *devm_phy_create(struct device *dev, struct device_node *node, > ^ > > From an interaction with commit dc0a39386687 ("pinctrl: Add NVIDIA > Tegra XUSB pad controller support") from the arm-soc tree. > > Final merge fix patch: Ugh, what a mess, sorry about that. I'll keep this around for if I end up merging with Linus after these other trees get merged. thanks for doing this, greg k-h