drivers: phy: Handle gracefully NULL pointers
PATCH 1/1 drivers: phy: Handle gracefully NULL pointers
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 <[email protected]>
--- drivers/phy/phy-uclass.c | 30 +++++++++++++++++++++++++----- include/generic-phy.h | 2 +- 2 files changed, 26 insertions(+), 6 deletions(-)
drivers/phy/phy-uclass.c +25 -5
@@ -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 ; }
include/generic-phy.h +1 -1
@@ -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 */
Signature · 1 line
2.17.1
PATCH 1/1 drivers: phy: Handle gracefully NULL pointers
Quoted 4 lines · 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 <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191101/a515bd2f/attachment.sig>