2013-04-09 14:30:04

by Vivek Gautam

Subject: [PATCH] rtc: rtc-s3c: use clk_prepare_enable and clk_disable_unprepare

From: Thomas Abraham <[email protected]>

Convert clk_enable/clk_disable to clk_prepare_enable/clk_disable_unprepare
calls as required by common clock framework.

Signed-off-by: Thomas Abraham <[email protected]>
Signed-off-by: Vivek Gautam <[email protected]>
---

The v1 of this patch is pretty old, but the change needs to be merged to
avoid getting those needless WARN_ON() dumps on console.

Changes from v1:
- Not using clk_disable_unprepare() at the end of s3c_rtc_probe(), since
this will unprepare the rtc clock which is again getting used in other
funtions later.
- Using clk_unprepare() at the remove() instead to fix things up.

drivers/rtc/rtc-s3c.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index fb994e9..e3528c9 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -430,6 +430,7 @@ static int s3c_rtc_remove(struct platform_device *dev)

s3c_rtc_setaie(&dev->dev, 0);

+ clk_unprepare(rtc_clk);
rtc_clk = NULL;

return 0;
@@ -498,7 +499,7 @@ static int s3c_rtc_probe(struct platform_device *pdev)
return ret;
}

- clk_enable(rtc_clk);
+ clk_prepare_enable(rtc_clk);

/* check to see if everything is setup correctly */

@@ -578,7 +579,7 @@ static int s3c_rtc_probe(struct platform_device *pdev)

err_nortc:
s3c_rtc_enable(pdev, 0);
- clk_disable(rtc_clk);
+ clk_disable_unprepare(rtc_clk);

return ret;
}
--
1.7.6.5

2013-04-10 09:50:33

by Sylwester Nawrocki

Subject: Re: [PATCH] rtc: rtc-s3c: use clk_prepare_enable and clk_disable_unprepare

On 04/09/2013 04:27 PM, Vivek Gautam wrote:
> From: Thomas Abraham <[email protected]>
>
> Convert clk_enable/clk_disable to clk_prepare_enable/clk_disable_unprepare
> calls as required by common clock framework.
>
> Signed-off-by: Thomas Abraham <[email protected]>
> Signed-off-by: Vivek Gautam <[email protected]>

Thanks Vivek.

Reviewed-by: Sylwester Nawrocki <[email protected]>

> ---
>
> The v1 of this patch is pretty old, but the change needs to be merged to
> avoid getting those needless WARN_ON() dumps on console.
>
> Changes from v1:
> - Not using clk_disable_unprepare() at the end of s3c_rtc_probe(), since
> this will unprepare the rtc clock which is again getting used in other
> funtions later.
> - Using clk_unprepare() at the remove() instead to fix things up.
>
> drivers/rtc/rtc-s3c.c | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
> index fb994e9..e3528c9 100644
> --- a/drivers/rtc/rtc-s3c.c
> +++ b/drivers/rtc/rtc-s3c.c
> @@ -430,6 +430,7 @@ static int s3c_rtc_remove(struct platform_device *dev)
>
> s3c_rtc_setaie(&dev->dev, 0);
>
> + clk_unprepare(rtc_clk);
> rtc_clk = NULL;
>
> return 0;
> @@ -498,7 +499,7 @@ static int s3c_rtc_probe(struct platform_device *pdev)
> return ret;
> }
>
> - clk_enable(rtc_clk);
> + clk_prepare_enable(rtc_clk);
>
> /* check to see if everything is setup correctly */
>
> @@ -578,7 +579,7 @@ static int s3c_rtc_probe(struct platform_device *pdev)
>
> err_nortc:
> s3c_rtc_enable(pdev, 0);
> - clk_disable(rtc_clk);
> + clk_disable_unprepare(rtc_clk);
>
> return ret;
> }

2013-04-10 11:40:00

by Vivek Gautam

Subject: Re: [PATCH] rtc: rtc-s3c: use clk_prepare_enable and clk_disable_unprepare

On Wed, Apr 10, 2013 at 3:20 PM, Sylwester Nawrocki
<[email protected]> wrote:
> On 04/09/2013 04:27 PM, Vivek Gautam wrote:
>> From: Thomas Abraham <[email protected]>
>>
>> Convert clk_enable/clk_disable to clk_prepare_enable/clk_disable_unprepare
>> calls as required by common clock framework.
>>
>> Signed-off-by: Thomas Abraham <[email protected]>
>> Signed-off-by: Vivek Gautam <[email protected]>
>
> Thanks Vivek.

your welcome :-)

>
> Reviewed-by: Sylwester Nawrocki <[email protected]>
>



--
Thanks & Regards
Vivek

2013-04-11 04:09:13

by Jingoo Han

Subject: Re: [PATCH] rtc: rtc-s3c: use clk_prepare_enable and clk_disable_unprepare

On Wednesday, April 10, 2013 6:50 PM, Sylwester Nawrocki wrote:
> On 04/09/2013 04:27 PM, Vivek Gautam wrote:
> > From: Thomas Abraham <[email protected]>
> >
> > Convert clk_enable/clk_disable to clk_prepare_enable/clk_disable_unprepare
> > calls as required by common clock framework.
> >
> > Signed-off-by: Thomas Abraham <[email protected]>
> > Signed-off-by: Vivek Gautam <[email protected]>
>
> Thanks Vivek.
>
> Reviewed-by: Sylwester Nawrocki <[email protected]>

CC'ed Andrew Morton

It looks good.
Reviewed-by: Jingoo Han <[email protected]>

>
> > ---
> >
> > The v1 of this patch is pretty old, but the change needs to be merged to
> > avoid getting those needless WARN_ON() dumps on console.
> >
> > Changes from v1:
> > - Not using clk_disable_unprepare() at the end of s3c_rtc_probe(), since
> > this will unprepare the rtc clock which is again getting used in other
> > funtions later.
> > - Using clk_unprepare() at the remove() instead to fix things up.
> >
> > drivers/rtc/rtc-s3c.c | 5 +++--
> > 1 files changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
> > index fb994e9..e3528c9 100644
> > --- a/drivers/rtc/rtc-s3c.c
> > +++ b/drivers/rtc/rtc-s3c.c
> > @@ -430,6 +430,7 @@ static int s3c_rtc_remove(struct platform_device *dev)
> >
> > s3c_rtc_setaie(&dev->dev, 0);
> >
> > + clk_unprepare(rtc_clk);
> > rtc_clk = NULL;
> >
> > return 0;
> > @@ -498,7 +499,7 @@ static int s3c_rtc_probe(struct platform_device *pdev)
> > return ret;
> > }
> >
> > - clk_enable(rtc_clk);
> > + clk_prepare_enable(rtc_clk);
> >
> > /* check to see if everything is setup correctly */
> >
> > @@ -578,7 +579,7 @@ static int s3c_rtc_probe(struct platform_device *pdev)
> >
> > err_nortc:
> > s3c_rtc_enable(pdev, 0);
> > - clk_disable(rtc_clk);
> > + clk_disable_unprepare(rtc_clk);
> >
> > return ret;
> > }
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

2013-04-22 17:10:32

by Kukjin Kim

Subject: Re: [PATCH] rtc: rtc-s3c: use clk_prepare_enable and clk_disable_unprepare

On 04/11/13 13:09, Jingoo Han wrote:
> On Wednesday, April 10, 2013 6:50 PM, Sylwester Nawrocki wrote:
>> On 04/09/2013 04:27 PM, Vivek Gautam wrote:
>>> From: Thomas Abraham<[email protected]>
>>>
>>> Convert clk_enable/clk_disable to clk_prepare_enable/clk_disable_unprepare
>>> calls as required by common clock framework.
>>>
>>> Signed-off-by: Thomas Abraham<[email protected]>
>>> Signed-off-by: Vivek Gautam<[email protected]>

Acked-by: Kukjin Kim <[email protected]>

>>
>> Thanks Vivek.
>>
>> Reviewed-by: Sylwester Nawrocki<[email protected]>
>
> CC'ed Andrew Morton
>
> It looks good.
> Reviewed-by: Jingoo Han<[email protected]>
>
>>
>>> ---
>>>
>>> The v1 of this patch is pretty old, but the change needs to be merged to
>>> avoid getting those needless WARN_ON() dumps on console.
>>>
>>> Changes from v1:
>>> - Not using clk_disable_unprepare() at the end of s3c_rtc_probe(), since
>>> this will unprepare the rtc clock which is again getting used in other
>>> funtions later.
>>> - Using clk_unprepare() at the remove() instead to fix things up.
>>>
>>> drivers/rtc/rtc-s3c.c | 5 +++--
>>> 1 files changed, 3 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
>>> index fb994e9..e3528c9 100644
>>> --- a/drivers/rtc/rtc-s3c.c
>>> +++ b/drivers/rtc/rtc-s3c.c
>>> @@ -430,6 +430,7 @@ static int s3c_rtc_remove(struct platform_device *dev)
>>>
>>> s3c_rtc_setaie(&dev->dev, 0);
>>>
>>> + clk_unprepare(rtc_clk);
>>> rtc_clk = NULL;
>>>
>>> return 0;
>>> @@ -498,7 +499,7 @@ static int s3c_rtc_probe(struct platform_device *pdev)
>>> return ret;
>>> }
>>>
>>> - clk_enable(rtc_clk);
>>> + clk_prepare_enable(rtc_clk);
>>>
>>> /* check to see if everything is setup correctly */
>>>
>>> @@ -578,7 +579,7 @@ static int s3c_rtc_probe(struct platform_device *pdev)
>>>
>>> err_nortc:
>>> s3c_rtc_enable(pdev, 0);
>>> - clk_disable(rtc_clk);
>>> + clk_disable_unprepare(rtc_clk);
>>>
>>> return ret;
>>> }