[PATCH][next] phy: core: make NULL a valid phy reference if !CONFIG_GENERIC_PHY

[Kishon Vijay Abraham I]

Hi Santosh,

On Thursday 13 March 2014 07:07 PM, Santosh Shilimkar wrote:
> On Thursday 13 March 2014 07:11 PM, Strashko, Grygorii wrote:
>> This fixes a regression on Keystone 2 platforms caused by patch
>> 57303488cd37da58263e842de134dc65f7c626d5
>> "usb: dwc3: adapt dwc3 core to use Generic PHY Framework" which adds
>> optional support of generic phy in DWC3 core.
>>
>> On Keystone 2 platforms the USB is not working now because
>> CONFIG_GENERIC_PHY isn't set and, as result, Generic PHY APIs stubs
>> return -ENOSYS always. The log shows:
>>   dwc3 2690000.dwc3: failed to initialize core
>>   dwc3: probe of 2690000.dwc3 failed with error -38
>>
>> Hence, fix it by making NULL a valid phy reference in Generic PHY
>> APIs stubs in the same way as it was done by the patch
>> 04c2facad8fee66c981a51852806d8923336f362 "drivers: phy: Make NULL
>> a valid phy reference".
>>
>> CC: Kishon Vijay Abraham I <kishon at ti.com>
>> CC: Felipe Balbi <balbi at ti.com>
>> CC: Santosh Shilimkar <santosh.shilimkar at ti.com>
>> Signed-off-by: Grygorii Strashko <grygorii.strashko at ti.com>
>> ---
> This fixes the regression seen in Linux next and patch seems
> reasonable to me.
> Acked-by: Santosh Shilimkar <santosh.shilimkar at ti.com>
>
> Felipe, Kishon,
> Can you guys pick this fix if you are ok by it. Thanks

I've already given a PULL request to Greg for 3.15. Is it ok to take 
this in -rc cycle?

-Kishon
>
>
>>   include/linux/phy/phy.h |    8 ++++++++
>>   1 file changed, 8 insertions(+)
>>
>> diff --git a/include/linux/phy/phy.h b/include/linux/phy/phy.h
>> index e2f5ca9..5a9b193 100644
>> --- a/include/linux/phy/phy.h
>> +++ b/include/linux/phy/phy.h
>> @@ -204,21 +204,29 @@ static inline void phy_pm_runtime_forbid(struct phy *phy)
>>
>>   static inline int phy_init(struct phy *phy)
>>   {
>> +	if (!phy)
>> +		return 0;
>>   	return -ENOSYS;
>>   }
>>
>>   static inline int phy_exit(struct phy *phy)
>>   {
>> +	if (!phy)
>> +		return 0;
>>   	return -ENOSYS;
>>   }
>>
>>   static inline int phy_power_on(struct phy *phy)
>>   {
>> +	if (!phy)
>> +		return 0;
>>   	return -ENOSYS;
>>   }
>>
>>   static inline int phy_power_off(struct phy *phy)
>>   {
>> +	if (!phy)
>> +		return 0;
>>   	return -ENOSYS;
>>   }
>>
>>
>