From: Boris BREZILLON <b.brezillon@overkiz.com> To: Nicolas Ferre <nicolas.ferre@atmel.com>, Ludovic Desroches <ludovic.desroches@atmel.com>, Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>, Felipe Balbi <balbi@ti.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Boris BREZILLON <b.brezillon@overkiz.com> Subject: [PATCH 5/8] usb: gadget: at91_udc: prepare clk before calling enable Date: Wed, 19 Jun 2013 13:18:41 +0200 [thread overview] Message-ID: <1371640721-9661-1-git-send-email-b.brezillon@overkiz.com> (raw) In-Reply-To: <1371640263-9268-1-git-send-email-b.brezillon@overkiz.com> Replace clk_enable/disable with clk_prepare_enable/disable_unprepare to avoid common clk framework warnings. Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com> --- drivers/usb/gadget/at91_udc.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c index 073b938..fce8e4e 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c @@ -870,8 +870,8 @@ static void clk_on(struct at91_udc *udc) if (udc->clocked) return; udc->clocked = 1; - clk_enable(udc->iclk); - clk_enable(udc->fclk); + clk_prepare_enable(udc->iclk); + clk_prepare_enable(udc->fclk); } static void clk_off(struct at91_udc *udc) @@ -880,8 +880,8 @@ static void clk_off(struct at91_udc *udc) return; udc->clocked = 0; udc->gadget.speed = USB_SPEED_UNKNOWN; - clk_disable(udc->fclk); - clk_disable(udc->iclk); + clk_disable_unprepare(udc->fclk); + clk_disable_unprepare(udc->iclk); } /* @@ -1782,12 +1782,14 @@ static int at91udc_probe(struct platform_device *pdev) } /* don't do anything until we have both gadget driver and VBUS */ - clk_enable(udc->iclk); + retval = clk_prepare_enable(udc->iclk); + if (retval) + goto fail1; at91_udp_write(udc, AT91_UDP_TXVC, AT91_UDP_TXVC_TXVDIS); at91_udp_write(udc, AT91_UDP_IDR, 0xffffffff); /* Clear all pending interrupts - UDP may be used by bootloader. */ at91_udp_write(udc, AT91_UDP_ICR, 0xffffffff); - clk_disable(udc->iclk); + clk_disable_unprepare(udc->iclk); /* request UDC and maybe VBUS irqs */ udc->udp_irq = platform_get_irq(pdev, 0); -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: b.brezillon@overkiz.com (Boris BREZILLON) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 5/8] usb: gadget: at91_udc: prepare clk before calling enable Date: Wed, 19 Jun 2013 13:18:41 +0200 [thread overview] Message-ID: <1371640721-9661-1-git-send-email-b.brezillon@overkiz.com> (raw) In-Reply-To: <1371640263-9268-1-git-send-email-b.brezillon@overkiz.com> Replace clk_enable/disable with clk_prepare_enable/disable_unprepare to avoid common clk framework warnings. Signed-off-by: Boris BREZILLON <b.brezillon@overkiz.com> --- drivers/usb/gadget/at91_udc.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c index 073b938..fce8e4e 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c @@ -870,8 +870,8 @@ static void clk_on(struct at91_udc *udc) if (udc->clocked) return; udc->clocked = 1; - clk_enable(udc->iclk); - clk_enable(udc->fclk); + clk_prepare_enable(udc->iclk); + clk_prepare_enable(udc->fclk); } static void clk_off(struct at91_udc *udc) @@ -880,8 +880,8 @@ static void clk_off(struct at91_udc *udc) return; udc->clocked = 0; udc->gadget.speed = USB_SPEED_UNKNOWN; - clk_disable(udc->fclk); - clk_disable(udc->iclk); + clk_disable_unprepare(udc->fclk); + clk_disable_unprepare(udc->iclk); } /* @@ -1782,12 +1782,14 @@ static int at91udc_probe(struct platform_device *pdev) } /* don't do anything until we have both gadget driver and VBUS */ - clk_enable(udc->iclk); + retval = clk_prepare_enable(udc->iclk); + if (retval) + goto fail1; at91_udp_write(udc, AT91_UDP_TXVC, AT91_UDP_TXVC_TXVDIS); at91_udp_write(udc, AT91_UDP_IDR, 0xffffffff); /* Clear all pending interrupts - UDP may be used by bootloader. */ at91_udp_write(udc, AT91_UDP_ICR, 0xffffffff); - clk_disable(udc->iclk); + clk_disable_unprepare(udc->iclk); /* request UDC and maybe VBUS irqs */ udc->udp_irq = platform_get_irq(pdev, 0); -- 1.7.9.5
next prev parent reply other threads:[~2013-06-19 11:18 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-06-19 11:11 [PATCH 0/8] ARM: at91: prepare the move to common clk framework Boris BREZILLON 2013-06-19 11:11 ` Boris BREZILLON 2013-06-19 11:13 ` [PATCH 1/8] ARM: at91/tc/clocksource: replace clk_enable/disable with clk_prepare_enable/disable_unprepare Boris BREZILLON 2013-06-19 11:13 ` Boris BREZILLON 2013-06-20 7:33 ` Nicolas Ferre 2013-06-20 7:33 ` Nicolas Ferre 2013-06-19 11:14 ` [PATCH 2/8] at_hdmac: prepare clk before calling enable Boris BREZILLON 2013-06-19 11:14 ` Boris BREZILLON 2013-06-20 7:43 ` Nicolas Ferre 2013-06-20 7:43 ` Nicolas Ferre 2013-06-21 2:40 ` Vinod Koul 2013-06-21 2:40 ` Vinod Koul 2013-06-24 17:40 ` Nicolas Ferre 2013-06-24 17:40 ` Nicolas Ferre 2013-06-19 11:15 ` Boris BREZILLON 2013-06-19 11:15 ` Boris BREZILLON 2013-06-19 11:16 ` [PATCH 3/8] mmc: atmel-mci: " Boris BREZILLON 2013-06-19 11:16 ` Boris BREZILLON 2013-06-19 11:16 ` Boris BREZILLON 2013-06-19 12:50 ` Ludovic Desroches 2013-06-19 12:50 ` Ludovic Desroches 2013-06-19 11:17 ` [PATCH 4/8] tty: atmel_serial: " Boris BREZILLON 2013-06-19 11:17 ` Boris BREZILLON 2013-06-19 11:17 ` Boris BREZILLON 2013-06-20 7:48 ` Nicolas Ferre 2013-06-20 7:48 ` Nicolas Ferre 2013-06-20 7:48 ` Nicolas Ferre 2013-06-20 8:06 ` boris brezillon 2013-06-20 8:06 ` boris brezillon 2013-06-20 10:20 ` Nicolas Ferre 2013-06-20 10:20 ` Nicolas Ferre 2013-06-20 10:20 ` Nicolas Ferre 2013-06-19 11:18 ` Boris BREZILLON [this message] 2013-06-19 11:18 ` [PATCH 5/8] usb: gadget: at91_udc: " Boris BREZILLON 2013-06-19 11:20 ` [PATCH 6/8] ehci-atmel.c: " Boris BREZILLON 2013-06-19 11:20 ` Boris BREZILLON 2013-06-19 11:21 ` [PATCH 7/8] USB: ohci-at91: " Boris BREZILLON 2013-06-19 11:21 ` Boris BREZILLON 2013-06-19 11:22 ` [PATCH 8/8] at91/avr32/atmel_lcdfb: " Boris BREZILLON 2013-06-19 11:22 ` Boris BREZILLON 2013-06-19 11:22 ` Boris BREZILLON 2013-06-20 7:49 ` Nicolas Ferre 2013-06-20 7:49 ` Nicolas Ferre 2013-06-20 7:49 ` Nicolas Ferre
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1371640721-9661-1-git-send-email-b.brezillon@overkiz.com \ --to=b.brezillon@overkiz.com \ --cc=balbi@ti.com \ --cc=gregkh@linuxfoundation.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-usb@vger.kernel.org \ --cc=ludovic.desroches@atmel.com \ --cc=nicolas.ferre@atmel.com \ --cc=plagnioj@jcrosoft.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.