From patchwork Thu Jul 24 07:07:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 4614721 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AF0FDC0514 for ; Thu, 24 Jul 2014 07:11:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7DD2E201CD for ; Thu, 24 Jul 2014 07:11:02 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6195120154 for ; Thu, 24 Jul 2014 07:11:01 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XAD8f-0004ko-2W; Thu, 24 Jul 2014 07:08:29 +0000 Received: from ozlabs.org ([103.22.144.67]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XAD8b-0004Yo-RR for linux-arm-kernel@lists.infradead.org; Thu, 24 Jul 2014 07:08:27 +0000 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 523831401EB; Thu, 24 Jul 2014 17:08:02 +1000 (EST) Date: Thu, 24 Jul 2014 17:07:55 +1000 From: Stephen Rothwell To: Greg KH , Olof Johansson , Arnd Bergmann , Subject: linux-next: build failure after merge of the usb tree Message-ID: <20140724170755.035cea1c@canb.auug.org.au> X-Mailer: Claws Mail 3.10.1 (GTK+ 2.24.24; i486-pc-linux-gnu) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140724_000826_351190_68841843 X-CRM114-Status: GOOD ( 14.76 ) X-Spam-Score: 0.0 (/) Cc: Thierry Reding , Pratyush Anand , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Viresh Kumar X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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: From: Stephen Rothwell Date: Thu, 24 Jul 2014 16:55:16 +1000 Subject: [PATCH] phy: fix up for devm_phy_create api change Signed-off-by: Stephen Rothwell --- drivers/phy/phy-spear1310-miphy.c | 2 +- drivers/phy/phy-spear1340-miphy.c | 2 +- drivers/pinctrl/pinctrl-tegra-xusb.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/phy/phy-spear1310-miphy.c b/drivers/phy/phy-spear1310-miphy.c index c58c869d57e0..6dcbfcddb372 100644 --- a/drivers/phy/phy-spear1310-miphy.c +++ b/drivers/phy/phy-spear1310-miphy.c @@ -229,7 +229,7 @@ static int spear1310_miphy_probe(struct platform_device *pdev) return -EINVAL; } - priv->phy = devm_phy_create(dev, &spear1310_miphy_ops, NULL); + priv->phy = devm_phy_create(dev, NULL, &spear1310_miphy_ops, NULL); if (IS_ERR(priv->phy)) { dev_err(dev, "failed to create SATA PCIe PHY\n"); return PTR_ERR(priv->phy); diff --git a/drivers/phy/phy-spear1340-miphy.c b/drivers/phy/phy-spear1340-miphy.c index 8de98adf21c3..7135ba2603b6 100644 --- a/drivers/phy/phy-spear1340-miphy.c +++ b/drivers/phy/phy-spear1340-miphy.c @@ -261,7 +261,7 @@ static int spear1340_miphy_probe(struct platform_device *pdev) return PTR_ERR(priv->misc); } - priv->phy = devm_phy_create(dev, &spear1340_miphy_ops, NULL); + priv->phy = devm_phy_create(dev, NULL, &spear1340_miphy_ops, NULL); if (IS_ERR(priv->phy)) { dev_err(dev, "failed to create SATA PCIe PHY\n"); return PTR_ERR(priv->phy); diff --git a/drivers/pinctrl/pinctrl-tegra-xusb.c b/drivers/pinctrl/pinctrl-tegra-xusb.c index 4a7daf577b49..a06620474845 100644 --- a/drivers/pinctrl/pinctrl-tegra-xusb.c +++ b/drivers/pinctrl/pinctrl-tegra-xusb.c @@ -910,7 +910,7 @@ static int tegra_xusb_padctl_probe(struct platform_device *pdev) goto reset; } - phy = devm_phy_create(&pdev->dev, &pcie_phy_ops, NULL); + phy = devm_phy_create(&pdev->dev, NULL, &pcie_phy_ops, NULL); if (IS_ERR(phy)) { err = PTR_ERR(phy); goto unregister; @@ -919,7 +919,7 @@ static int tegra_xusb_padctl_probe(struct platform_device *pdev) padctl->phys[TEGRA_XUSB_PADCTL_PCIE] = phy; phy_set_drvdata(phy, padctl); - phy = devm_phy_create(&pdev->dev, &sata_phy_ops, NULL); + phy = devm_phy_create(&pdev->dev, NULL, &sata_phy_ops, NULL); if (IS_ERR(phy)) { err = PTR_ERR(phy); goto unregister;