diff mbox

[v3,23/23] mfd: omap-usb-host: Don't spam console on clk_set_parent failure

Message ID 1354631514-24815-8-git-send-email-rogerq@ti.com (mailing list archive)
State New, archived
Headers show

Commit Message

Roger Quadros Dec. 4, 2012, 2:31 p.m. UTC
clk_set_parent is expected to fail on OMAP3 platforms. We don't
consider that as fatal so don't spam console.

Signed-off-by: Roger Quadros <rogerq@ti.com>
---
 drivers/mfd/omap-usb-host.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

Comments

Sergei Shtylyov Dec. 5, 2012, 1:42 p.m. UTC | #1
Hello.

On 04-12-2012 18:31, Roger Quadros wrote:

> clk_set_parent is expected to fail on OMAP3 platforms. We don't
> consider that as fatal so don't spam console.

> Signed-off-by: Roger Quadros <rogerq@ti.com>
> ---
>   drivers/mfd/omap-usb-host.c |   18 +++++++++---------
>   1 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
> index 0bb54393..e5257dc 100644
> --- a/drivers/mfd/omap-usb-host.c
> +++ b/drivers/mfd/omap-usb-host.c
> @@ -657,32 +657,32 @@ static int __devinit usbhs_omap_probe(struct platform_device *pdev)
>   	}
>
>   	if (is_ehci_phy_mode(pdata->port_mode[0])) {
> -		/* for OMAP3 , the clk set paretn fails */
> +		/* for OMAP3, clk_set_parent fails */
>   		ret = clk_set_parent(omap->utmi_clk[0],
>   					omap->xclk60mhsp1_ck);
>   		if (ret != 0)
> -			dev_err(dev, "xclk60mhsp1_ck set parent"
> -				"failed error:%d\n", ret);
> +			dev_dbg(dev, "xclk60mhsp1_ck set parent failed : %d\n",
> +					ret);
>   	} else if (is_ehci_tll_mode(pdata->port_mode[0])) {
>   		ret = clk_set_parent(omap->utmi_clk[0],
>   					omap->init_60m_fclk);
>   		if (ret != 0)
> -			dev_err(dev, "init_60m_fclk set parent"
> -				"failed error:%d\n", ret);
> +			dev_dbg(dev, "P0 init_60m_fclk set parent failed: %d\n",
> +					ret);
>   	}
>
>   	if (is_ehci_phy_mode(pdata->port_mode[1])) {
>   		ret = clk_set_parent(omap->utmi_clk[1],
>   					omap->xclk60mhsp2_ck);
>   		if (ret != 0)
> -			dev_err(dev, "xclk60mhsp2_ck set parent"
> -					"failed error:%d\n", ret);
> +			dev_dbg(dev, "xclk60mhsp2_ck set parent failed : %d\n",
> +					ret);
>   	} else if (is_ehci_tll_mode(pdata->port_mode[1])) {
>   		ret = clk_set_parent(omap->utmi_clk[1],
>   						omap->init_60m_fclk);
>   		if (ret != 0)
> -			dev_err(dev, "init_60m_fclk set parent"
> -				"failed error:%d\n", ret);
> +			dev_dbg(dev, "P1 init_60m_fclk set parent failed: %d\n",
> +					ret);

    Hm, you sometimes put a space before colon in the error message and 
sometimes not. Inconsistent. :-)

WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Roger Quadros Dec. 5, 2012, 2:13 p.m. UTC | #2
On 12/05/2012 03:42 PM, Sergei Shtylyov wrote:
> Hello.
> 
> On 04-12-2012 18:31, Roger Quadros wrote:
> 
>> clk_set_parent is expected to fail on OMAP3 platforms. We don't
>> consider that as fatal so don't spam console.
> 
>> Signed-off-by: Roger Quadros <rogerq@ti.com>
>> ---
>>   drivers/mfd/omap-usb-host.c |   18 +++++++++---------
>>   1 files changed, 9 insertions(+), 9 deletions(-)
>>
>> diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
>> index 0bb54393..e5257dc 100644
>> --- a/drivers/mfd/omap-usb-host.c
>> +++ b/drivers/mfd/omap-usb-host.c
>> @@ -657,32 +657,32 @@ static int __devinit usbhs_omap_probe(struct
>> platform_device *pdev)
>>       }
>>
>>       if (is_ehci_phy_mode(pdata->port_mode[0])) {
>> -        /* for OMAP3 , the clk set paretn fails */
>> +        /* for OMAP3, clk_set_parent fails */
>>           ret = clk_set_parent(omap->utmi_clk[0],
>>                       omap->xclk60mhsp1_ck);
>>           if (ret != 0)
>> -            dev_err(dev, "xclk60mhsp1_ck set parent"
>> -                "failed error:%d\n", ret);
>> +            dev_dbg(dev, "xclk60mhsp1_ck set parent failed : %d\n",
>> +                    ret);
>>       } else if (is_ehci_tll_mode(pdata->port_mode[0])) {
>>           ret = clk_set_parent(omap->utmi_clk[0],
>>                       omap->init_60m_fclk);
>>           if (ret != 0)
>> -            dev_err(dev, "init_60m_fclk set parent"
>> -                "failed error:%d\n", ret);
>> +            dev_dbg(dev, "P0 init_60m_fclk set parent failed: %d\n",
>> +                    ret);
>>       }
>>
>>       if (is_ehci_phy_mode(pdata->port_mode[1])) {
>>           ret = clk_set_parent(omap->utmi_clk[1],
>>                       omap->xclk60mhsp2_ck);
>>           if (ret != 0)
>> -            dev_err(dev, "xclk60mhsp2_ck set parent"
>> -                    "failed error:%d\n", ret);
>> +            dev_dbg(dev, "xclk60mhsp2_ck set parent failed : %d\n",
>> +                    ret);
>>       } else if (is_ehci_tll_mode(pdata->port_mode[1])) {
>>           ret = clk_set_parent(omap->utmi_clk[1],
>>                           omap->init_60m_fclk);
>>           if (ret != 0)
>> -            dev_err(dev, "init_60m_fclk set parent"
>> -                "failed error:%d\n", ret);
>> +            dev_dbg(dev, "P1 init_60m_fclk set parent failed: %d\n",
>> +                    ret);
> 
>    Hm, you sometimes put a space before colon in the error message and
> sometimes not. Inconsistent. :-)
> 

That was because it fit in 80 characters without the space. I'm not sure
what is more important, fitting in 80 or consistency in the print
message. Maybe i should have removed the spaces everywhere so that it is
consistent as well. :)

cheers,
-roger

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Felipe Balbi Dec. 13, 2012, 10:46 a.m. UTC | #3
On Wed, Dec 05, 2012 at 04:13:46PM +0200, Roger Quadros wrote:
> On 12/05/2012 03:42 PM, Sergei Shtylyov wrote:
> > Hello.
> > 
> > On 04-12-2012 18:31, Roger Quadros wrote:
> > 
> >> clk_set_parent is expected to fail on OMAP3 platforms. We don't
> >> consider that as fatal so don't spam console.
> > 
> >> Signed-off-by: Roger Quadros <rogerq@ti.com>
> >> ---
> >>   drivers/mfd/omap-usb-host.c |   18 +++++++++---------
> >>   1 files changed, 9 insertions(+), 9 deletions(-)
> >>
> >> diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
> >> index 0bb54393..e5257dc 100644
> >> --- a/drivers/mfd/omap-usb-host.c
> >> +++ b/drivers/mfd/omap-usb-host.c
> >> @@ -657,32 +657,32 @@ static int __devinit usbhs_omap_probe(struct
> >> platform_device *pdev)
> >>       }
> >>
> >>       if (is_ehci_phy_mode(pdata->port_mode[0])) {
> >> -        /* for OMAP3 , the clk set paretn fails */
> >> +        /* for OMAP3, clk_set_parent fails */
> >>           ret = clk_set_parent(omap->utmi_clk[0],
> >>                       omap->xclk60mhsp1_ck);
> >>           if (ret != 0)
> >> -            dev_err(dev, "xclk60mhsp1_ck set parent"
> >> -                "failed error:%d\n", ret);
> >> +            dev_dbg(dev, "xclk60mhsp1_ck set parent failed : %d\n",
> >> +                    ret);
> >>       } else if (is_ehci_tll_mode(pdata->port_mode[0])) {
> >>           ret = clk_set_parent(omap->utmi_clk[0],
> >>                       omap->init_60m_fclk);
> >>           if (ret != 0)
> >> -            dev_err(dev, "init_60m_fclk set parent"
> >> -                "failed error:%d\n", ret);
> >> +            dev_dbg(dev, "P0 init_60m_fclk set parent failed: %d\n",
> >> +                    ret);
> >>       }
> >>
> >>       if (is_ehci_phy_mode(pdata->port_mode[1])) {
> >>           ret = clk_set_parent(omap->utmi_clk[1],
> >>                       omap->xclk60mhsp2_ck);
> >>           if (ret != 0)
> >> -            dev_err(dev, "xclk60mhsp2_ck set parent"
> >> -                    "failed error:%d\n", ret);
> >> +            dev_dbg(dev, "xclk60mhsp2_ck set parent failed : %d\n",
> >> +                    ret);
> >>       } else if (is_ehci_tll_mode(pdata->port_mode[1])) {
> >>           ret = clk_set_parent(omap->utmi_clk[1],
> >>                           omap->init_60m_fclk);
> >>           if (ret != 0)
> >> -            dev_err(dev, "init_60m_fclk set parent"
> >> -                "failed error:%d\n", ret);
> >> +            dev_dbg(dev, "P1 init_60m_fclk set parent failed: %d\n",
> >> +                    ret);
> > 
> >    Hm, you sometimes put a space before colon in the error message and
> > sometimes not. Inconsistent. :-)
> > 
> 
> That was because it fit in 80 characters without the space. I'm not sure
> what is more important, fitting in 80 or consistency in the print
> message. Maybe i should have removed the spaces everywhere so that it is
> consistent as well. :)

I'd say it's the consistency :-)
Jassi Brar Dec. 13, 2012, 11:04 a.m. UTC | #4
On 5 December 2012 19:43, Roger Quadros <rogerq@ti.com> wrote:
> On 12/05/2012 03:42 PM, Sergei Shtylyov wrote:
>> Hello.
>>
>> On 04-12-2012 18:31, Roger Quadros wrote:
>>
>>> clk_set_parent is expected to fail on OMAP3 platforms. We don't
>>> consider that as fatal so don't spam console.
>>
>>> Signed-off-by: Roger Quadros <rogerq@ti.com>
>>> ---
>>>   drivers/mfd/omap-usb-host.c |   18 +++++++++---------
>>>   1 files changed, 9 insertions(+), 9 deletions(-)
>>>
>>> diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
>>> index 0bb54393..e5257dc 100644
>>> --- a/drivers/mfd/omap-usb-host.c
>>> +++ b/drivers/mfd/omap-usb-host.c
>>> @@ -657,32 +657,32 @@ static int __devinit usbhs_omap_probe(struct
>>> platform_device *pdev)
>>>       }
>>>
>>>       if (is_ehci_phy_mode(pdata->port_mode[0])) {
>>> -        /* for OMAP3 , the clk set paretn fails */
>>> +        /* for OMAP3, clk_set_parent fails */
>>>           ret = clk_set_parent(omap->utmi_clk[0],
>>>                       omap->xclk60mhsp1_ck);
>>>           if (ret != 0)
>>> -            dev_err(dev, "xclk60mhsp1_ck set parent"
>>> -                "failed error:%d\n", ret);
>>> +            dev_dbg(dev, "xclk60mhsp1_ck set parent failed : %d\n",
>>> +                    ret);
>>>       } else if (is_ehci_tll_mode(pdata->port_mode[0])) {
>>>           ret = clk_set_parent(omap->utmi_clk[0],
>>>                       omap->init_60m_fclk);
>>>           if (ret != 0)
>>> -            dev_err(dev, "init_60m_fclk set parent"
>>> -                "failed error:%d\n", ret);
>>> +            dev_dbg(dev, "P0 init_60m_fclk set parent failed: %d\n",
>>> +                    ret);
>>>       }
>>>
>>>       if (is_ehci_phy_mode(pdata->port_mode[1])) {
>>>           ret = clk_set_parent(omap->utmi_clk[1],
>>>                       omap->xclk60mhsp2_ck);
>>>           if (ret != 0)
>>> -            dev_err(dev, "xclk60mhsp2_ck set parent"
>>> -                    "failed error:%d\n", ret);
>>> +            dev_dbg(dev, "xclk60mhsp2_ck set parent failed : %d\n",
>>> +                    ret);
>>>       } else if (is_ehci_tll_mode(pdata->port_mode[1])) {
>>>           ret = clk_set_parent(omap->utmi_clk[1],
>>>                           omap->init_60m_fclk);
>>>           if (ret != 0)
>>> -            dev_err(dev, "init_60m_fclk set parent"
>>> -                "failed error:%d\n", ret);
>>> +            dev_dbg(dev, "P1 init_60m_fclk set parent failed: %d\n",
>>> +                    ret);
>>
>>    Hm, you sometimes put a space before colon in the error message and
>> sometimes not. Inconsistent. :-)
>>
>
> That was because it fit in 80 characters without the space. I'm not sure
> what is more important, fitting in 80 or consistency in the print
> message. Maybe i should have removed the spaces everywhere so that it is
> consistent as well. :)
>
prints are one thing where breaking the 80 column rule is acceptable.
Otherwise it fails grep'ing
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index 0bb54393..e5257dc 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -657,32 +657,32 @@  static int __devinit usbhs_omap_probe(struct platform_device *pdev)
 	}
 
 	if (is_ehci_phy_mode(pdata->port_mode[0])) {
-		/* for OMAP3 , the clk set paretn fails */
+		/* for OMAP3, clk_set_parent fails */
 		ret = clk_set_parent(omap->utmi_clk[0],
 					omap->xclk60mhsp1_ck);
 		if (ret != 0)
-			dev_err(dev, "xclk60mhsp1_ck set parent"
-				"failed error:%d\n", ret);
+			dev_dbg(dev, "xclk60mhsp1_ck set parent failed : %d\n",
+					ret);
 	} else if (is_ehci_tll_mode(pdata->port_mode[0])) {
 		ret = clk_set_parent(omap->utmi_clk[0],
 					omap->init_60m_fclk);
 		if (ret != 0)
-			dev_err(dev, "init_60m_fclk set parent"
-				"failed error:%d\n", ret);
+			dev_dbg(dev, "P0 init_60m_fclk set parent failed: %d\n",
+					ret);
 	}
 
 	if (is_ehci_phy_mode(pdata->port_mode[1])) {
 		ret = clk_set_parent(omap->utmi_clk[1],
 					omap->xclk60mhsp2_ck);
 		if (ret != 0)
-			dev_err(dev, "xclk60mhsp2_ck set parent"
-					"failed error:%d\n", ret);
+			dev_dbg(dev, "xclk60mhsp2_ck set parent failed : %d\n",
+					ret);
 	} else if (is_ehci_tll_mode(pdata->port_mode[1])) {
 		ret = clk_set_parent(omap->utmi_clk[1],
 						omap->init_60m_fclk);
 		if (ret != 0)
-			dev_err(dev, "init_60m_fclk set parent"
-				"failed error:%d\n", ret);
+			dev_dbg(dev, "P1 init_60m_fclk set parent failed: %d\n",
+					ret);
 	}
 
 	omap_usbhs_init(dev);