diff mbox

[09/12] usb: gadget: r8a66597-udc: Convert to clk_prepare/unprepare

Message ID 1383000569-8916-10-git-send-email-laurent.pinchart+renesas@ideasonboard.com (mailing list archive)
State New, archived
Headers show

Commit Message

Laurent Pinchart Oct. 28, 2013, 10:49 p.m. UTC
Turn clk_enable() and clk_disable() calls into clk_prepare_enable() and
clk_disable_unprepare() to get ready for the migration to the common
clock framework.

Cc: Felipe Balbi <balbi@ti.com>
Cc: linux-usb@vger.kernel.org
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 drivers/usb/gadget/r8a66597-udc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Yoshihiro Shimoda Oct. 29, 2013, 9:47 a.m. UTC | #1
Hi Laurent-san,

(2013/10/29 7:49), Laurent Pinchart wrote:
> Turn clk_enable() and clk_disable() calls into clk_prepare_enable() and
> clk_disable_unprepare() to get ready for the migration to the common
> clock framework.
> 
> Cc: Felipe Balbi <balbi@ti.com>
> Cc: linux-usb@vger.kernel.org
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

Thank you for the patch.

Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>

Best regards,
Yoshihro Shimoda

> ---
>  drivers/usb/gadget/r8a66597-udc.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/usb/gadget/r8a66597-udc.c b/drivers/usb/gadget/r8a66597-udc.c
> index 68be48d..4728751 100644
> --- a/drivers/usb/gadget/r8a66597-udc.c
> +++ b/drivers/usb/gadget/r8a66597-udc.c
> @@ -1833,7 +1833,7 @@ static int __exit r8a66597_remove(struct platform_device *pdev)
>  	r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req);
>  
>  	if (r8a66597->pdata->on_chip) {
> -		clk_disable(r8a66597->clk);
> +		clk_disable_unprepare(r8a66597->clk);
>  		clk_put(r8a66597->clk);
>  	}
>  
> @@ -1931,7 +1931,7 @@ static int __init r8a66597_probe(struct platform_device *pdev)
>  			ret = PTR_ERR(r8a66597->clk);
>  			goto clean_up;
>  		}
> -		clk_enable(r8a66597->clk);
> +		clk_prepare_enable(r8a66597->clk);
>  	}
>  
>  	if (r8a66597->pdata->sudmac) {
> @@ -1996,7 +1996,7 @@ clean_up3:
>  	free_irq(irq, r8a66597);
>  clean_up2:
>  	if (r8a66597->pdata->on_chip) {
> -		clk_disable(r8a66597->clk);
> +		clk_disable_unprepare(r8a66597->clk);
>  		clk_put(r8a66597->clk);
>  	}
>  clean_up:
>
Laurent Pinchart Nov. 9, 2013, 2:09 p.m. UTC | #2
Hi Felipe,

On Tuesday 29 October 2013 18:47:19 Shimoda, Yoshihiro wrote:
> Hi Laurent-san,
> 
> (2013/10/29 7:49), Laurent Pinchart wrote:
> > Turn clk_enable() and clk_disable() calls into clk_prepare_enable() and
> > clk_disable_unprepare() to get ready for the migration to the common
> > clock framework.
> > 
> > Cc: Felipe Balbi <balbi@ti.com>
> > Cc: linux-usb@vger.kernel.org
> > Signed-off-by: Laurent Pinchart
> > <laurent.pinchart+renesas@ideasonboard.com>
> 
> Thank you for the patch.
> 
> Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>

Could you please pick this patch up ?

> > ---
> > 
> >  drivers/usb/gadget/r8a66597-udc.c | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/drivers/usb/gadget/r8a66597-udc.c
> > b/drivers/usb/gadget/r8a66597-udc.c index 68be48d..4728751 100644
> > --- a/drivers/usb/gadget/r8a66597-udc.c
> > +++ b/drivers/usb/gadget/r8a66597-udc.c
> > @@ -1833,7 +1833,7 @@ static int __exit r8a66597_remove(struct
> > platform_device *pdev)> 
> >  	r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req);
> >  	
> >  	if (r8a66597->pdata->on_chip) {
> > 
> > -		clk_disable(r8a66597->clk);
> > +		clk_disable_unprepare(r8a66597->clk);
> > 
> >  		clk_put(r8a66597->clk);
> >  	
> >  	}
> > 
> > @@ -1931,7 +1931,7 @@ static int __init r8a66597_probe(struct
> > platform_device *pdev)> 
> >  			ret = PTR_ERR(r8a66597->clk);
> >  			goto clean_up;
> >  		
> >  		}
> > 
> > -		clk_enable(r8a66597->clk);
> > +		clk_prepare_enable(r8a66597->clk);
> > 
> >  	}
> >  	
> >  	if (r8a66597->pdata->sudmac) {
> > 
> > @@ -1996,7 +1996,7 @@ clean_up3:
> >  	free_irq(irq, r8a66597);
> >  
> >  clean_up2:
> >  	if (r8a66597->pdata->on_chip) {
> > 
> > -		clk_disable(r8a66597->clk);
> > +		clk_disable_unprepare(r8a66597->clk);
> > 
> >  		clk_put(r8a66597->clk);
> >  	
> >  	}
> >  
> >  clean_up:
Felipe Balbi Nov. 11, 2013, 7:53 p.m. UTC | #3
On Sat, Nov 09, 2013 at 03:09:33PM +0100, Laurent Pinchart wrote:
> Hi Felipe,
> 
> On Tuesday 29 October 2013 18:47:19 Shimoda, Yoshihiro wrote:
> > Hi Laurent-san,
> > 
> > (2013/10/29 7:49), Laurent Pinchart wrote:
> > > Turn clk_enable() and clk_disable() calls into clk_prepare_enable() and
> > > clk_disable_unprepare() to get ready for the migration to the common
> > > clock framework.
> > > 
> > > Cc: Felipe Balbi <balbi@ti.com>
> > > Cc: linux-usb@vger.kernel.org
> > > Signed-off-by: Laurent Pinchart
> > > <laurent.pinchart+renesas@ideasonboard.com>
> > 
> > Thank you for the patch.
> > 
> > Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> 
> Could you please pick this patch up ?

after -rc1 is out, I don't see why not.
Laurent Pinchart Nov. 26, 2013, 1:59 a.m. UTC | #4
Hi Felipe,

On Monday 11 November 2013 13:53:31 Felipe Balbi wrote:
> On Sat, Nov 09, 2013 at 03:09:33PM +0100, Laurent Pinchart wrote:
> > Hi Felipe,
> > 
> > On Tuesday 29 October 2013 18:47:19 Shimoda, Yoshihiro wrote:
> > > Hi Laurent-san,
> > > 
> > > (2013/10/29 7:49), Laurent Pinchart wrote:
> > > > Turn clk_enable() and clk_disable() calls into clk_prepare_enable()
> > > > and clk_disable_unprepare() to get ready for the migration to the
> > > > common clock framework.
> > > > 
> > > > Cc: Felipe Balbi <balbi@ti.com>
> > > > Cc: linux-usb@vger.kernel.org
> > > > Signed-off-by: Laurent Pinchart
> > > > <laurent.pinchart+renesas@ideasonboard.com>
> > > 
> > > Thank you for the patch.
> > > 
> > > Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > 
> > Could you please pick this patch up ?
> 
> after -rc1 is out, I don't see why not.

Great then :-)

As this patch is a dependency for other series that will go through different 
trees, could you please provide a stable branch in your tree with this patch 
included that you will push to v3.14 ?
Felipe Balbi Nov. 26, 2013, 2:12 a.m. UTC | #5
Hi,

On Tue, Nov 26, 2013 at 02:59:51AM +0100, Laurent Pinchart wrote:
> > > > (2013/10/29 7:49), Laurent Pinchart wrote:
> > > > > Turn clk_enable() and clk_disable() calls into clk_prepare_enable()
> > > > > and clk_disable_unprepare() to get ready for the migration to the
> > > > > common clock framework.
> > > > > 
> > > > > Cc: Felipe Balbi <balbi@ti.com>
> > > > > Cc: linux-usb@vger.kernel.org
> > > > > Signed-off-by: Laurent Pinchart
> > > > > <laurent.pinchart+renesas@ideasonboard.com>
> > > > 
> > > > Thank you for the patch.
> > > > 
> > > > Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > > 
> > > Could you please pick this patch up ?
> > 
> > after -rc1 is out, I don't see why not.
> 
> Great then :-)
> 
> As this patch is a dependency for other series that will go through
> different trees, could you please provide a stable branch in your tree
> with this patch included that you will push to v3.14 ?

You guys are always killing me with those "stable branch" requests :-)

I'll get one up tomorrow. I guess I can avoid a topic branch altogether
if I just make this the first patch in "next" branch. I could push only
$subject for now until you merge then I'll push other stuff. Is that
enough for you ? My 'next' is always immutable.
Laurent Pinchart Nov. 26, 2013, 2:16 a.m. UTC | #6
Hi Felipe,

On Monday 25 November 2013 20:12:39 Felipe Balbi wrote:
> Hi,
> 
> On Tue, Nov 26, 2013 at 02:59:51AM +0100, Laurent Pinchart wrote:
> > > > > (2013/10/29 7:49), Laurent Pinchart wrote:
> > > > > > Turn clk_enable() and clk_disable() calls into
> > > > > > clk_prepare_enable()
> > > > > > and clk_disable_unprepare() to get ready for the migration to the
> > > > > > common clock framework.
> > > > > > 
> > > > > > Cc: Felipe Balbi <balbi@ti.com>
> > > > > > Cc: linux-usb@vger.kernel.org
> > > > > > Signed-off-by: Laurent Pinchart
> > > > > > <laurent.pinchart+renesas@ideasonboard.com>
> > > > > 
> > > > > Thank you for the patch.
> > > > > 
> > > > > Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > > > 
> > > > Could you please pick this patch up ?
> > > 
> > > after -rc1 is out, I don't see why not.
> > 
> > Great then :-)
> > 
> > As this patch is a dependency for other series that will go through
> > different trees, could you please provide a stable branch in your tree
> > with this patch included that you will push to v3.14 ?
> 
> You guys are always killing me with those "stable branch" requests :-)
> 
> I'll get one up tomorrow. I guess I can avoid a topic branch altogether
> if I just make this the first patch in "next" branch. I could push only
> $subject for now until you merge then I'll push other stuff. Is that
> enough for you ? My 'next' is always immutable.

That sounds good, thank you. You can already push the other patches without 
waiting for me, I can dig the commit ID of the first patch in your next 
branch.
Felipe Balbi Nov. 26, 2013, 7:54 p.m. UTC | #7
On Tue, Nov 26, 2013 at 03:16:47AM +0100, Laurent Pinchart wrote:
> Hi Felipe,
> 
> On Monday 25 November 2013 20:12:39 Felipe Balbi wrote:
> > Hi,
> > 
> > On Tue, Nov 26, 2013 at 02:59:51AM +0100, Laurent Pinchart wrote:
> > > > > > (2013/10/29 7:49), Laurent Pinchart wrote:
> > > > > > > Turn clk_enable() and clk_disable() calls into
> > > > > > > clk_prepare_enable()
> > > > > > > and clk_disable_unprepare() to get ready for the migration to the
> > > > > > > common clock framework.
> > > > > > > 
> > > > > > > Cc: Felipe Balbi <balbi@ti.com>
> > > > > > > Cc: linux-usb@vger.kernel.org
> > > > > > > Signed-off-by: Laurent Pinchart
> > > > > > > <laurent.pinchart+renesas@ideasonboard.com>
> > > > > > 
> > > > > > Thank you for the patch.
> > > > > > 
> > > > > > Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > > > > 
> > > > > Could you please pick this patch up ?
> > > > 
> > > > after -rc1 is out, I don't see why not.
> > > 
> > > Great then :-)
> > > 
> > > As this patch is a dependency for other series that will go through
> > > different trees, could you please provide a stable branch in your tree
> > > with this patch included that you will push to v3.14 ?
> > 
> > You guys are always killing me with those "stable branch" requests :-)
> > 
> > I'll get one up tomorrow. I guess I can avoid a topic branch altogether
> > if I just make this the first patch in "next" branch. I could push only
> > $subject for now until you merge then I'll push other stuff. Is that
> > enough for you ? My 'next' is always immutable.
> 
> That sounds good, thank you. You can already push the other patches without 
> waiting for me, I can dig the commit ID of the first patch in your next 
> branch.

pushed, btw. you should have received my automatic email. If you merge
my next, you'll get only that commit. I believe tomorrow I'll be able to
push more commits into next.
Laurent Pinchart Nov. 26, 2013, 9:43 p.m. UTC | #8
Hi Felipe,

On Tuesday 26 November 2013 13:54:22 Felipe Balbi wrote:
> On Tue, Nov 26, 2013 at 03:16:47AM +0100, Laurent Pinchart wrote:
> > On Monday 25 November 2013 20:12:39 Felipe Balbi wrote:
> > > On Tue, Nov 26, 2013 at 02:59:51AM +0100, Laurent Pinchart wrote:
> > > > > > > (2013/10/29 7:49), Laurent Pinchart wrote:
> > > > > > > > Turn clk_enable() and clk_disable() calls into
> > > > > > > > clk_prepare_enable()
> > > > > > > > and clk_disable_unprepare() to get ready for the migration to
> > > > > > > > the
> > > > > > > > common clock framework.
> > > > > > > > 
> > > > > > > > Cc: Felipe Balbi <balbi@ti.com>
> > > > > > > > Cc: linux-usb@vger.kernel.org
> > > > > > > > Signed-off-by: Laurent Pinchart
> > > > > > > > <laurent.pinchart+renesas@ideasonboard.com>
> > > > > > > 
> > > > > > > Thank you for the patch.
> > > > > > > 
> > > > > > > Acked-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > > > > > 
> > > > > > Could you please pick this patch up ?
> > > > > 
> > > > > after -rc1 is out, I don't see why not.
> > > > 
> > > > Great then :-)
> > > > 
> > > > As this patch is a dependency for other series that will go through
> > > > different trees, could you please provide a stable branch in your tree
> > > > with this patch included that you will push to v3.14 ?
> > > 
> > > You guys are always killing me with those "stable branch" requests :-)
> > > 
> > > I'll get one up tomorrow. I guess I can avoid a topic branch altogether
> > > if I just make this the first patch in "next" branch. I could push only
> > > $subject for now until you merge then I'll push other stuff. Is that
> > > enough for you ? My 'next' is always immutable.
> > 
> > That sounds good, thank you. You can already push the other patches
> > without waiting for me, I can dig the commit ID of the first patch in your
> > next branch.
> 
> pushed, btw. you should have received my automatic email.

I have, thank you.

> If you merge my next, you'll get only that commit. I believe tomorrow I'll
> be able to push more commits into next.

I've asked Simon Horman (the Renesas SoC kernel maintainer) to merge your next 
branch in his tree.
diff mbox

Patch

diff --git a/drivers/usb/gadget/r8a66597-udc.c b/drivers/usb/gadget/r8a66597-udc.c
index 68be48d..4728751 100644
--- a/drivers/usb/gadget/r8a66597-udc.c
+++ b/drivers/usb/gadget/r8a66597-udc.c
@@ -1833,7 +1833,7 @@  static int __exit r8a66597_remove(struct platform_device *pdev)
 	r8a66597_free_request(&r8a66597->ep[0].ep, r8a66597->ep0_req);
 
 	if (r8a66597->pdata->on_chip) {
-		clk_disable(r8a66597->clk);
+		clk_disable_unprepare(r8a66597->clk);
 		clk_put(r8a66597->clk);
 	}
 
@@ -1931,7 +1931,7 @@  static int __init r8a66597_probe(struct platform_device *pdev)
 			ret = PTR_ERR(r8a66597->clk);
 			goto clean_up;
 		}
-		clk_enable(r8a66597->clk);
+		clk_prepare_enable(r8a66597->clk);
 	}
 
 	if (r8a66597->pdata->sudmac) {
@@ -1996,7 +1996,7 @@  clean_up3:
 	free_irq(irq, r8a66597);
 clean_up2:
 	if (r8a66597->pdata->on_chip) {
-		clk_disable(r8a66597->clk);
+		clk_disable_unprepare(r8a66597->clk);
 		clk_put(r8a66597->clk);
 	}
 clean_up: