2016-10-25 14:15:51

by Randy Li

[permalink] [raw]
Subject: [PATCH] phy: Add reset callback for not generic phy

I forget to add a dummy function in case the CONFIG_GENERIC_PHY
is disabled.

Signed-off-by: Randy Li <[email protected]>
---
include/linux/phy/phy.h | 7 +++++++
1 file changed, 7 insertions(+)

diff --git a/include/linux/phy/phy.h b/include/linux/phy/phy.h
index ee1bed7..78bb0d7 100644
--- a/include/linux/phy/phy.h
+++ b/include/linux/phy/phy.h
@@ -253,6 +253,13 @@ static inline int phy_set_mode(struct phy *phy, enum phy_mode mode)
return -ENOSYS;
}

+static inline int phy_reset(struct phy *phy)
+{
+ if (!phy)
+ return 0;
+ return -ENOSYS;
+}
+
static inline int phy_get_bus_width(struct phy *phy)
{
return -ENOSYS;
--
2.7.4


2016-10-25 20:47:16

by John Youn

[permalink] [raw]
Subject: Re: [PATCH] phy: Add reset callback for not generic phy

On 10/25/2016 7:15 AM, Randy Li wrote:
> I forget to add a dummy function in case the CONFIG_GENERIC_PHY
> is disabled.
>
> Signed-off-by: Randy Li <[email protected]>

Fixes: cac18ecb6f44 ("phy: Add reset callback")
Tested-by: John Youn <[email protected]>

Hi Kishon,

Can you take this for 4.9-rc?

Thanks,
John



> ---
> include/linux/phy/phy.h | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/include/linux/phy/phy.h b/include/linux/phy/phy.h
> index ee1bed7..78bb0d7 100644
> --- a/include/linux/phy/phy.h
> +++ b/include/linux/phy/phy.h
> @@ -253,6 +253,13 @@ static inline int phy_set_mode(struct phy *phy, enum phy_mode mode)
> return -ENOSYS;
> }
>
> +static inline int phy_reset(struct phy *phy)
> +{
> + if (!phy)
> + return 0;
> + return -ENOSYS;
> +}
> +
> static inline int phy_get_bus_width(struct phy *phy)
> {
> return -ENOSYS;
>
>



2016-10-26 20:15:23

by Kishon Vijay Abraham I

[permalink] [raw]
Subject: Re: [PATCH] phy: Add reset callback for not generic phy



On Wednesday 26 October 2016 02:17 AM, John Youn wrote:
> On 10/25/2016 7:15 AM, Randy Li wrote:
>> I forget to add a dummy function in case the CONFIG_GENERIC_PHY
>> is disabled.
>>
>> Signed-off-by: Randy Li <[email protected]>
>
> Fixes: cac18ecb6f44 ("phy: Add reset callback")
> Tested-by: John Youn <[email protected]>
>
> Hi Kishon,
>
> Can you take this for 4.9-rc?

sure, merged now.

Thanks
Kishon

>
> Thanks,
> John
>
>
>
>> ---
>> include/linux/phy/phy.h | 7 +++++++
>> 1 file changed, 7 insertions(+)
>>
>> diff --git a/include/linux/phy/phy.h b/include/linux/phy/phy.h
>> index ee1bed7..78bb0d7 100644
>> --- a/include/linux/phy/phy.h
>> +++ b/include/linux/phy/phy.h
>> @@ -253,6 +253,13 @@ static inline int phy_set_mode(struct phy *phy, enum phy_mode mode)
>> return -ENOSYS;
>> }
>>
>> +static inline int phy_reset(struct phy *phy)
>> +{
>> + if (!phy)
>> + return 0;
>> + return -ENOSYS;
>> +}
>> +
>> static inline int phy_get_bus_width(struct phy *phy)
>> {
>> return -ENOSYS;
>>
>>
>
>
>