summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2013-03-14 17:59:06 +0200
committerFelipe Balbi <balbi@ti.com>2013-03-18 11:18:26 +0200
commitb7fa5c2aec5be083eb2719b405089703608e9bc6 (patch)
tree9a25ce9c81a5f5ec974ffd69482a98dca4694637
parent3bf6db9bbe4ad7b08b714c1857a703c1ef1b1e83 (diff)
downloadlinux-3.10-b7fa5c2aec5be083eb2719b405089703608e9bc6.tar.gz
linux-3.10-b7fa5c2aec5be083eb2719b405089703608e9bc6.tar.bz2
linux-3.10-b7fa5c2aec5be083eb2719b405089703608e9bc6.zip
usb: phy: return -ENXIO when PHY layer isn't enabled
in cases where PHY layer isn't enabled, we want to still return an error code (actually an error pointer) so that our users don't need to cope with either error pointer of NULL. This will simplify users as below: - return IS_ERR(phy) ? PTR_ERR(phy) : -ENODEV; + return PTR_ERR(phy); Acked-by: Kishon Vijay Abraham I <kishon@ti.com> Reported-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Felipe Balbi <balbi@ti.com>
-rw-r--r--include/linux/usb/phy.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/usb/phy.h b/include/linux/usb/phy.h
index b7c2217c585..6b5978f5763 100644
--- a/include/linux/usb/phy.h
+++ b/include/linux/usb/phy.h
@@ -197,29 +197,29 @@ extern int usb_bind_phy(const char *dev_name, u8 index,
#else
static inline struct usb_phy *usb_get_phy(enum usb_phy_type type)
{
- return NULL;
+ return ERR_PTR(-ENXIO);
}
static inline struct usb_phy *devm_usb_get_phy(struct device *dev,
enum usb_phy_type type)
{
- return NULL;
+ return ERR_PTR(-ENXIO);
}
static inline struct usb_phy *usb_get_phy_dev(struct device *dev, u8 index)
{
- return NULL;
+ return ERR_PTR(-ENXIO);
}
static inline struct usb_phy *devm_usb_get_phy_dev(struct device *dev, u8 index)
{
- return NULL;
+ return ERR_PTR(-ENXIO);
}
static inline struct usb_phy *devm_usb_get_phy_by_phandle(struct device *dev,
const char *phandle, u8 index)
{
- return NULL;
+ return ERR_PTR(-ENXIO);
}
static inline void usb_put_phy(struct usb_phy *x)