[U-Boot] [PATCH] drivers: phy: Handle gracefully NULL pointers

[Jean-Jacques Hiblot]

For some controllers PHYs can be optional. Handling NULL pointers without
crashing nor failing, makes it easy to handle optional PHYs.

Signed-off-by: Jean-Jacques Hiblot <jjhib...@ti.com>
---
 drivers/phy/phy-uclass.c | 30 +++++++++++++++++++++++++-----
 include/generic-phy.h    |  2 +-
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/drivers/phy/phy-uclass.c b/drivers/phy/phy-uclass.c
index a0ac30aa71..e201a90c8c 100644
--- a/drivers/phy/phy-uclass.c
+++ b/drivers/phy/phy-uclass.c
@@ -108,35 +108,55 @@ int generic_phy_get_by_name(struct udevice *dev, const 
char *phy_name,
 
 int generic_phy_init(struct phy *phy)
 {
-       struct phy_ops const *ops = phy_dev_ops(phy->dev);
+       struct phy_ops const *ops;
+
+       if (!phy)
+               return 0;
+       ops = phy_dev_ops(phy->dev);
 
        return ops->init ? ops->init(phy) : 0;
 }
 
 int generic_phy_reset(struct phy *phy)
 {
-       struct phy_ops const *ops = phy_dev_ops(phy->dev);
+       struct phy_ops const *ops;
+
+       if (!phy)
+               return 0;
+       ops = phy_dev_ops(phy->dev);
 
        return ops->reset ? ops->reset(phy) : 0;
 }
 
 int generic_phy_exit(struct phy *phy)
 {
-       struct phy_ops const *ops = phy_dev_ops(phy->dev);
+       struct phy_ops const *ops;
+
+       if (!phy)
+               return 0;
+       ops = phy_dev_ops(phy->dev);
 
        return ops->exit ? ops->exit(phy) : 0;
 }
 
 int generic_phy_power_on(struct phy *phy)
 {
-       struct phy_ops const *ops = phy_dev_ops(phy->dev);
+       struct phy_ops const *ops;
+
+       if (!phy)
+               return 0;
+       ops = phy_dev_ops(phy->dev);
 
        return ops->power_on ? ops->power_on(phy) : 0;
 }
 
 int generic_phy_power_off(struct phy *phy)
 {
-       struct phy_ops const *ops = phy_dev_ops(phy->dev);
+       struct phy_ops const *ops;
+
+       if (!phy)
+               return 0;
+       ops = phy_dev_ops(phy->dev);
 
        return ops->power_off ? ops->power_off(phy) : 0;
 }
diff --git a/include/generic-phy.h b/include/generic-phy.h
index 947c582f68..95caf58341 100644
--- a/include/generic-phy.h
+++ b/include/generic-phy.h
@@ -270,7 +270,7 @@ static inline int generic_phy_get_by_name(struct udevice 
*user, const char *phy_
  */
 static inline bool generic_phy_valid(struct phy *phy)
 {
-       return phy->dev != NULL;
+       return phy && phy->dev;
 }
 
 #endif /*__GENERIC_PHY_H */
-- 
2.17.1

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot