From: Kishon Vijay Abraham I <kishon@ti.com>
To: <gregkh@linuxfoundation.org>
Cc: <kishon@ti.com>, <linux-kernel@vger.kernel.org>
Subject: [PATCH 4/7] phy: sun4i-usb: Use devm_gpiod_get_optional for optional GPIOs
Date: Sun, 18 Oct 2015 02:03:28 +0530 [thread overview]
Message-ID: <1445114011-4191-5-git-send-email-kishon@ti.com> (raw)
In-Reply-To: <1445114011-4191-1-git-send-email-kishon@ti.com>
From: Axel Lin <axel.lin@ingics.com>
Both data->id_det_gpio and data->vbus_det_gpio are optional, so use
devm_gpiod_get_optional for them.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
drivers/phy/phy-sun4i-usb.c | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/drivers/phy/phy-sun4i-usb.c b/drivers/phy/phy-sun4i-usb.c
index 731b395..b12964b 100644
--- a/drivers/phy/phy-sun4i-usb.c
+++ b/drivers/phy/phy-sun4i-usb.c
@@ -551,19 +551,15 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev)
if (IS_ERR(data->base))
return PTR_ERR(data->base);
- data->id_det_gpio = devm_gpiod_get(dev, "usb0_id_det", GPIOD_IN);
- if (IS_ERR(data->id_det_gpio)) {
- if (PTR_ERR(data->id_det_gpio) == -EPROBE_DEFER)
- return -EPROBE_DEFER;
- data->id_det_gpio = NULL;
- }
-
- data->vbus_det_gpio = devm_gpiod_get(dev, "usb0_vbus_det", GPIOD_IN);
- if (IS_ERR(data->vbus_det_gpio)) {
- if (PTR_ERR(data->vbus_det_gpio) == -EPROBE_DEFER)
- return -EPROBE_DEFER;
- data->vbus_det_gpio = NULL;
- }
+ data->id_det_gpio = devm_gpiod_get_optional(dev, "usb0_id_det",
+ GPIOD_IN);
+ if (IS_ERR(data->id_det_gpio))
+ return PTR_ERR(data->id_det_gpio);
+
+ data->vbus_det_gpio = devm_gpiod_get_optional(dev, "usb0_vbus_det",
+ GPIOD_IN);
+ if (IS_ERR(data->vbus_det_gpio))
+ return PTR_ERR(data->vbus_det_gpio);
if (of_find_property(np, "usb0_vbus_power-supply", NULL)) {
data->vbus_power_supply = devm_power_supply_get_by_phandle(dev,
--
1.7.9.5
next prev parent reply other threads:[~2015-10-17 20:33 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-17 20:33 [RESEND GIT PULL] phy: for 4.4 merge window Kishon Vijay Abraham I
2015-10-17 20:33 ` [PATCH 1/7] phy: exynos-usb2: add vbus regulator support Kishon Vijay Abraham I
2015-10-17 20:33 ` [PATCH 2/7] dt-bindings: Add usb3.0 phy binding for MT65xx SoCs Kishon Vijay Abraham I
2015-10-17 20:33 ` [PATCH 3/7] phy: add usb3.0 phy driver for mt65xx SoCs Kishon Vijay Abraham I
2015-10-17 20:33 ` Kishon Vijay Abraham I [this message]
2015-10-17 20:33 ` [PATCH 5/7] dt-bindings: Add Cygnus PCIe PHY binding doc Kishon Vijay Abraham I
2015-10-17 20:33 ` [PATCH 6/7] phy: cygnus: pcie: Add Cygnus PCIe PHY support Kishon Vijay Abraham I
2015-10-17 20:33 ` [PATCH 7/7] MAINTAINERS: add Mediatek usb3 phy driver Kishon Vijay Abraham I
2015-10-18 3:13 ` [RESEND GIT PULL] phy: for 4.4 merge window Greg KH
-- strict thread matches above, loose matches on Subject: below --
2015-10-17 2:22 [GIT " Kishon Vijay Abraham I
2015-10-17 2:22 ` [PATCH 4/7] phy: sun4i-usb: Use devm_gpiod_get_optional for optional GPIOs Kishon Vijay Abraham I
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1445114011-4191-5-git-send-email-kishon@ti.com \
--to=kishon@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox