diff options
| author |   Chunfeng Yun <chunfeng.yun@mediatek.com> | 2018-08-31 18:01:54 +0800 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-10 20:09:45 +0200 |
| commit | 0a6ab90c0a8fc8ece91ad2bf7e3310ebb563b32b (patch) | |
| tree | ba5ee2f6cb4226f357b4af40dd54c057111fb609 /drivers/usb/core/phy.c | |
| parent | usb: mtu3: disable vbus rise/fall interrupts of ltssm (diff) | |
| download | linux-dev-0a6ab90c0a8fc8ece91ad2bf7e3310ebb563b32b.tar.xz linux-dev-0a6ab90c0a8fc8ece91ad2bf7e3310ebb563b32b.zip | |
usb: core: phy: clean up return value check about devm_of_phy_get_by_index()
Use IS_ERR() instead of IS_ERR_OR_NULL() because devm_of_phy_get_by_index()
never return NULL value;
But still need ignore the error of -ENODEV, for more information, please
refer to:
[0] https://lkml.org/lkml/2018/4/19/88
[1] https://patchwork.kernel.org/patch/10160181/
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
Reviewed-by: Johan Hovold <johan@kernel.org>
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core/phy.c')
| -rw-r--r-- | drivers/usb/core/phy.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/core/phy.c b/drivers/usb/core/phy.c index 9879767452a2..38b2c776c4b4 100644 --- a/drivers/usb/core/phy.c +++ b/drivers/usb/core/phy.c @@ -23,10 +23,11 @@ static int usb_phy_roothub_add_phy(struct device *dev, int index, struct list_head *list) { struct usb_phy_roothub *roothub_entry; - struct phy *phy = devm_of_phy_get_by_index(dev, dev->of_node, index); + struct phy *phy; - if (IS_ERR_OR_NULL(phy)) { - if (!phy || PTR_ERR(phy) == -ENODEV) + phy = devm_of_phy_get_by_index(dev, dev->of_node, index); + if (IS_ERR(phy)) { + if (PTR_ERR(phy) == -ENODEV) return 0; else return PTR_ERR(phy); |