From patchwork Fri Aug 8 16:47:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 4697251 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D79689F373 for ; Fri, 8 Aug 2014 16:50:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 15F922017A for ; Fri, 8 Aug 2014 16:50:11 +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 4437F20179 for ; Fri, 8 Aug 2014 16:50:10 +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 1XFnKv-0003gy-Ri; Fri, 08 Aug 2014 16:48:13 +0000 Received: from mail-pa0-f43.google.com ([209.85.220.43]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XFnKo-0003bL-Pz for linux-arm-kernel@lists.infradead.org; Fri, 08 Aug 2014 16:48:07 +0000 Received: by mail-pa0-f43.google.com with SMTP id lf10so7591279pab.2 for ; Fri, 08 Aug 2014 09:47:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RhlsYMdVc6odWXa0deiiKBvZ0Bxbn86Xup1snZe7KEI=; b=efaT4VdvtCACBBEk70riJ5FwZjKP0DYyzqNw5im7KPwPkPY1eFemH5cKqmeK9RZd+E Y1Lp4pdozoOh6cyGe5j5/PVc32RKThsbk5zYxcJhicBveS3nLWTFncNILz3N+w96/n2s VDLNNF+SHBqdoPBQQwb9R7r118bzEbYcSudsVdFFYUspxe1CRfZZBKc0938cbPb6/BAb sZlVgyM19VztR+42N8PKPNqNrHYqsEVKL4/pjZIVcuID3kW9EziTdeQ3wOSaPBZOnXx0 cuUAHFjOnadypSl+osGRqutK0OGhDqbgN2u7tf0sUyoD6msuFr1YLiQJDgeBaPYJY7cp Y/xQ== X-Gm-Message-State: ALoCoQkzhL9ae7WpYR6tFkJXAWy+XTxa4w0ataDCms0Uhvr95D3qwHDCTrI0WjdyqML9L8vJMu+O X-Received: by 10.70.61.10 with SMTP id l10mr2938389pdr.154.1407516470506; Fri, 08 Aug 2014 09:47:50 -0700 (PDT) Received: from quad.lixom.net (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by mx.google.com with ESMTPSA id b4sm5114003pdm.14.2014.08.08.09.47.49 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 08 Aug 2014 09:47:49 -0700 (PDT) From: Olof Johansson To: torvalds@linux-foundation.org Subject: [GIT PATCH 6/7] phy: fix up for devm_phy_create api change Date: Fri, 8 Aug 2014 09:47:58 -0700 Message-Id: <1407516479-1251-7-git-send-email-olof@lixom.net> X-Mailer: git-send-email 2.0.1.473.gc4d58ca In-Reply-To: <1407516479-1251-1-git-send-email-olof@lixom.net> References: <1407516479-1251-1-git-send-email-olof@lixom.net> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140808_094806_906148_DFDF9BD4 X-CRM114-Status: GOOD ( 12.89 ) X-Spam-Score: -1.4 (-) Cc: Olof Johansson , Stephen Rothwell , arm@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 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 From: Stephen Rothwell This is needed due to the devm changes going in through Greg's tree at the same time as a new driver was added through ours. Signed-off-by: Stephen Rothwell [olof: Write patch description] Signed-off-by: Olof Johansson --- I'm sending this inline with the merge requests to keep things as bisectable as possible. This is a patch that Stephen was carrying for us in -next, you can also squash it into the merge commit if you prefer. -Olof 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;