phy_init() and phy_exit() calls, and phy_power_on() and
phy_power_off() already accept NULL as valid PHY reference
and act as NOP. Extend same concept to phy runtime_pm APIs
to keep drivers (e.g. dwc3) code simple while dealing with
optional PHYs.
Signed-off-by: Manu Gautam <[email protected]>
---
Changes for v2:
- Fixed compilation warning
drivers/phy/phy-core.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index 3c31ce5..1fda576 100644
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -153,6 +153,9 @@ int phy_pm_runtime_get(struct phy *phy)
{
int ret;
+ if (!phy)
+ return 0;
+
if (!pm_runtime_enabled(&phy->dev))
return -ENOTSUPP;
@@ -168,6 +171,9 @@ int phy_pm_runtime_get_sync(struct phy *phy)
{
int ret;
+ if (!phy)
+ return 0;
+
if (!pm_runtime_enabled(&phy->dev))
return -ENOTSUPP;
@@ -181,6 +187,9 @@ int phy_pm_runtime_get_sync(struct phy *phy)
int phy_pm_runtime_put(struct phy *phy)
{
+ if (!phy)
+ return 0;
+
if (!pm_runtime_enabled(&phy->dev))
return -ENOTSUPP;
@@ -190,6 +199,9 @@ int phy_pm_runtime_put(struct phy *phy)
int phy_pm_runtime_put_sync(struct phy *phy)
{
+ if (!phy)
+ return 0;
+
if (!pm_runtime_enabled(&phy->dev))
return -ENOTSUPP;
@@ -199,6 +211,9 @@ int phy_pm_runtime_put_sync(struct phy *phy)
void phy_pm_runtime_allow(struct phy *phy)
{
+ if (!phy)
+ return;
+
if (!pm_runtime_enabled(&phy->dev))
return;
@@ -208,6 +223,9 @@ void phy_pm_runtime_allow(struct phy *phy)
void phy_pm_runtime_forbid(struct phy *phy)
{
+ if (!phy)
+ return;
+
if (!pm_runtime_enabled(&phy->dev))
return;
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
Hi Kishon,
On 3/20/2018 11:31 AM, Manu Gautam wrote:
> phy_init() and phy_exit() calls, and phy_power_on() and
> phy_power_off() already accept NULL as valid PHY reference
> and act as NOP. Extend same concept to phy runtime_pm APIs
> to keep drivers (e.g. dwc3) code simple while dealing with
> optional PHYs.
Wondering if you had a chance to review this.
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
On Tuesday 20 March 2018 11:31 AM, Manu Gautam wrote:
> phy_init() and phy_exit() calls, and phy_power_on() and
> phy_power_off() already accept NULL as valid PHY reference
> and act as NOP. Extend same concept to phy runtime_pm APIs
> to keep drivers (e.g. dwc3) code simple while dealing with
> optional PHYs.
>
> Signed-off-by: Manu Gautam <[email protected]>
merged, thanks!
-Kishon
> ---
> Changes for v2:
> - Fixed compilation warning
>
> drivers/phy/phy-core.c | 18 ++++++++++++++++++
> 1 file changed, 18 insertions(+)
>
> diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
> index 3c31ce5..1fda576 100644
> --- a/drivers/phy/phy-core.c
> +++ b/drivers/phy/phy-core.c
> @@ -153,6 +153,9 @@ int phy_pm_runtime_get(struct phy *phy)
> {
> int ret;
>
> + if (!phy)
> + return 0;
> +
> if (!pm_runtime_enabled(&phy->dev))
> return -ENOTSUPP;
>
> @@ -168,6 +171,9 @@ int phy_pm_runtime_get_sync(struct phy *phy)
> {
> int ret;
>
> + if (!phy)
> + return 0;
> +
> if (!pm_runtime_enabled(&phy->dev))
> return -ENOTSUPP;
>
> @@ -181,6 +187,9 @@ int phy_pm_runtime_get_sync(struct phy *phy)
>
> int phy_pm_runtime_put(struct phy *phy)
> {
> + if (!phy)
> + return 0;
> +
> if (!pm_runtime_enabled(&phy->dev))
> return -ENOTSUPP;
>
> @@ -190,6 +199,9 @@ int phy_pm_runtime_put(struct phy *phy)
>
> int phy_pm_runtime_put_sync(struct phy *phy)
> {
> + if (!phy)
> + return 0;
> +
> if (!pm_runtime_enabled(&phy->dev))
> return -ENOTSUPP;
>
> @@ -199,6 +211,9 @@ int phy_pm_runtime_put_sync(struct phy *phy)
>
> void phy_pm_runtime_allow(struct phy *phy)
> {
> + if (!phy)
> + return;
> +
> if (!pm_runtime_enabled(&phy->dev))
> return;
>
> @@ -208,6 +223,9 @@ void phy_pm_runtime_allow(struct phy *phy)
>
> void phy_pm_runtime_forbid(struct phy *phy)
> {
> + if (!phy)
> + return;
> +
> if (!pm_runtime_enabled(&phy->dev))
> return;
>
>