Patchwork IDE: palm_bk3710: convert clock usage after clkdev conversion

login
register
mail settings
Submitter Kevin Hilman
Date July 6, 2009, 10:26 p.m.
Message ID <1246919176-28683-1-git-send-email-khilman@deeprootsystems.com>
Download mbox | patch
Permalink /patch/29518/
State Accepted
Delegated to: David Miller
Headers show

Comments

Kevin Hilman - July 6, 2009, 10:26 p.m.
DaVinci core code has converted to the new clkdev API so
clock name strings are not needed.  Instead, just the a
'struct device' pointer is needed.

Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
---
Fix needed for 2.6.31

 drivers/ide/palm_bk3710.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Sergei Shtylyov - July 13, 2009, 6:21 p.m.
Hello.

Kevin Hilman wrote:

> DaVinci core code has converted to the new clkdev API so
> clock name strings are not needed.  Instead, just the a
> 'struct device' pointer is needed.
> 
> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>

> ---
> Fix needed for 2.6.31
> 
>  drivers/ide/palm_bk3710.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/ide/palm_bk3710.c b/drivers/ide/palm_bk3710.c
> index 3c1dc01..f8eddf0 100644
> --- a/drivers/ide/palm_bk3710.c
> +++ b/drivers/ide/palm_bk3710.c
> @@ -318,7 +318,7 @@ static int __init palm_bk3710_probe(struct platform_device *pdev)
>  	int i, rc;
>  	struct ide_hw hw, *hws[] = { &hw };
>  
> -	clk = clk_get(&pdev->dev, "IDECLK");
> +	clk = clk_get(&pdev->dev, NULL);
>  	if (IS_ERR(clk))
>  		return -ENODEV;
>  

    It doesn't seem strictly necessary for 2.6.31 -- only in the sense that 
"IDECLK" isn't named so anymore, however, clk_get() should still work.

MBR, Sergei
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kevin Hilman - July 13, 2009, 9:01 p.m.
Sergei Shtylyov <sshtylyov@ru.mvista.com> writes:

> Hello.
>
> Kevin Hilman wrote:
>
>> DaVinci core code has converted to the new clkdev API so
>> clock name strings are not needed.  Instead, just the a
>> 'struct device' pointer is needed.
>>
>> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
>
> Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
>
>> ---
>> Fix needed for 2.6.31

Can this fix be merged for the .31-rc series please?

Thanks,

Kevin

>>  drivers/ide/palm_bk3710.c |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/ide/palm_bk3710.c b/drivers/ide/palm_bk3710.c
>> index 3c1dc01..f8eddf0 100644
>> --- a/drivers/ide/palm_bk3710.c
>> +++ b/drivers/ide/palm_bk3710.c
>> @@ -318,7 +318,7 @@ static int __init palm_bk3710_probe(struct platform_device *pdev)
>>  	int i, rc;
>>  	struct ide_hw hw, *hws[] = { &hw };
>>  -	clk = clk_get(&pdev->dev, "IDECLK");
>> +	clk = clk_get(&pdev->dev, NULL);
>>  	if (IS_ERR(clk))
>>  		return -ENODEV;
>>  
>
>    It doesn't seem strictly necessary for 2.6.31 -- only in the sense
> that "IDECLK" isn't named so anymore, however, clk_get() should still
> work.
>
> MBR, Sergei
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - July 13, 2009, 9:07 p.m.
From: Kevin Hilman <khilman@deeprootsystems.com>
Date: Mon, 13 Jul 2009 14:01:55 -0700

> Sergei Shtylyov <sshtylyov@ru.mvista.com> writes:
> 
>> Hello.
>>
>> Kevin Hilman wrote:
>>
>>> DaVinci core code has converted to the new clkdev API so
>>> clock name strings are not needed.  Instead, just the a
>>> 'struct device' pointer is needed.
>>>
>>> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
>>
>> Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
>>
>>> ---
>>> Fix needed for 2.6.31
> 
> Can this fix be merged for the .31-rc series please?
> 
>>    It doesn't seem strictly necessary for 2.6.31 -- only in the sense
>> that "IDECLK" isn't named so anymore, however, clk_get() should still
>> work.

Either it's needed or it isn't.  It seems like it isn't, and since
the rules for integrating changes in the RC series right now is
strict, I'm only going to merge something if it is actually
necessary.
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kevin Hilman - July 14, 2009, 11:23 p.m.
On Mon, Jul 13, 2009 at 2:07 PM, David Miller<davem@davemloft.net> wrote:
> From: Kevin Hilman <khilman@deeprootsystems.com>
> Date: Mon, 13 Jul 2009 14:01:55 -0700
>
>> Sergei Shtylyov <sshtylyov@ru.mvista.com> writes:
>>
>>> Hello.
>>>
>>> Kevin Hilman wrote:
>>>
>>>> DaVinci core code has converted to the new clkdev API so
>>>> clock name strings are not needed.  Instead, just the a
>>>> 'struct device' pointer is needed.
>>>>
>>>> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
>>>
>>> Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
>>>
>>>> ---
>>>> Fix needed for 2.6.31
>>
>> Can this fix be merged for the .31-rc series please?
>>
>>>    It doesn't seem strictly necessary for 2.6.31 -- only in the sense
>>> that "IDECLK" isn't named so anymore, however, clk_get() should still
>>> work.
>
> Either it's needed or it isn't.  It seems like it isn't, and since
> the rules for integrating changes in the RC series right now is
> strict, I'm only going to merge something if it is actually
> necessary.
>

OK, after looking closer at clkdev, it looks like things will continue
to work in .31 without this patch, so this is merely confusing, and
not broken.

I'm ok if it waits until next merge window.

Thanks,

Kevin
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/ide/palm_bk3710.c b/drivers/ide/palm_bk3710.c
index 3c1dc01..f8eddf0 100644
--- a/drivers/ide/palm_bk3710.c
+++ b/drivers/ide/palm_bk3710.c
@@ -318,7 +318,7 @@  static int __init palm_bk3710_probe(struct platform_device *pdev)
 	int i, rc;
 	struct ide_hw hw, *hws[] = { &hw };
 
-	clk = clk_get(&pdev->dev, "IDECLK");
+	clk = clk_get(&pdev->dev, NULL);
 	if (IS_ERR(clk))
 		return -ENODEV;