From: balbi@ti.com (Felipe Balbi)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 09/12] usb: gadget: at91_udc: Simplify probe and remove functions
Date: Wed, 14 Jan 2015 11:38:22 -0600 [thread overview]
Message-ID: <20150114173822.GJ16533@saruman> (raw)
In-Reply-To: <1421252524-24452-10-git-send-email-alexandre.belloni@free-electrons.com>
On Wed, Jan 14, 2015 at 05:22:01PM +0100, Alexandre Belloni wrote:
> From: Boris Brezillon <boris.brezillon@free-electrons.com>
>
> Make use of devm_ functions to simplify probe and remove code.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Felipe Balbi <balbi@ti.com>
> ---
> drivers/usb/gadget/udc/at91_udc.c | 116 +++++++++++++-------------------------
> 1 file changed, 39 insertions(+), 77 deletions(-)
>
> diff --git a/drivers/usb/gadget/udc/at91_udc.c b/drivers/usb/gadget/udc/at91_udc.c
> index be7e16037ac4..4dba2c65dfd4 100644
> --- a/drivers/usb/gadget/udc/at91_udc.c
> +++ b/drivers/usb/gadget/udc/at91_udc.c
> @@ -1710,15 +1710,6 @@ static int at91udc_probe(struct platform_device *pdev)
> int retval;
> struct resource *res;
>
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - if (!res)
> - return -ENXIO;
> -
> - if (!request_mem_region(res->start, resource_size(res), driver_name)) {
> - DBG("someone's using UDC memory\n");
> - return -EBUSY;
> - }
> -
> /* init software state */
> udc = &controller;
> udc->gadget.dev.parent = dev;
> @@ -1731,13 +1722,13 @@ static int at91udc_probe(struct platform_device *pdev)
> if (cpu_is_at91rm9200()) {
> if (!gpio_is_valid(udc->board.pullup_pin)) {
> DBG("no D+ pullup?\n");
> - retval = -ENODEV;
> - goto fail0;
> + return -ENODEV;
> }
> - retval = gpio_request(udc->board.pullup_pin, "udc_pullup");
> + retval = devm_gpio_request(dev, udc->board.pullup_pin,
> + "udc_pullup");
> if (retval) {
> DBG("D+ pullup is busy\n");
> - goto fail0;
> + return retval;
> }
> gpio_direction_output(udc->board.pullup_pin,
> udc->board.pullup_active_low);
> @@ -1756,32 +1747,32 @@ static int at91udc_probe(struct platform_device *pdev)
> udc->ep[3].maxpacket = 64;
> }
>
> - udc->udp_baseaddr = ioremap(res->start, resource_size(res));
> - if (!udc->udp_baseaddr) {
> - retval = -ENOMEM;
> - goto fail0a;
> - }
> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + udc->udp_baseaddr = devm_ioremap_resource(dev, res);
> + if (IS_ERR(udc->udp_baseaddr))
> + return PTR_ERR(udc->udp_baseaddr);
>
> udc_reinit(udc);
>
> /* get interface and function clocks */
> - udc->iclk = clk_get(dev, "pclk");
> - udc->fclk = clk_get(dev, "hclk");
> - if (IS_ERR(udc->iclk) || IS_ERR(udc->fclk)) {
> - DBG("clocks missing\n");
> - retval = -ENODEV;
> - goto fail1;
> - }
> + udc->iclk = devm_clk_get(dev, "pclk");
> + if (IS_ERR(udc->iclk))
> + return PTR_ERR(udc->iclk);
> +
> + udc->fclk = devm_clk_get(dev, "hclk");
> + if (IS_ERR(udc->fclk))
> + return PTR_ERR(udc->fclk);
>
> /* don't do anything until we have both gadget driver and VBUS */
> clk_set_rate(udc->fclk, 48000000);
> retval = clk_prepare(udc->fclk);
> if (retval)
> - goto fail1;
> + return retval;
>
> retval = clk_prepare_enable(udc->iclk);
> if (retval)
> - goto fail1b;
> + goto err_unprepare_fclk;
> +
> 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. */
> @@ -1790,18 +1781,21 @@ static int at91udc_probe(struct platform_device *pdev)
>
> /* request UDC and maybe VBUS irqs */
> udc->udp_irq = platform_get_irq(pdev, 0);
> - retval = request_irq(udc->udp_irq, at91_udc_irq,
> - 0, driver_name, udc);
> - if (retval < 0) {
> + retval = devm_request_irq(dev, udc->udp_irq, at91_udc_irq, 0,
> + driver_name, udc);
> + if (retval) {
> DBG("request irq %d failed\n", udc->udp_irq);
> - goto fail1c;
> + goto err_unprepare_iclk;
> }
> +
> if (gpio_is_valid(udc->board.vbus_pin)) {
> - retval = gpio_request(udc->board.vbus_pin, "udc_vbus");
> - if (retval < 0) {
> + retval = devm_gpio_request(dev, udc->board.vbus_pin,
> + "udc_vbus");
> + if (retval) {
> DBG("request vbus pin failed\n");
> - goto fail2;
> + goto err_unprepare_iclk;
> }
> +
> gpio_direction_input(udc->board.vbus_pin);
>
> /*
> @@ -1818,12 +1812,13 @@ static int at91udc_probe(struct platform_device *pdev)
> mod_timer(&udc->vbus_timer,
> jiffies + VBUS_POLL_TIMEOUT);
> } else {
> - if (request_irq(gpio_to_irq(udc->board.vbus_pin),
> - at91_vbus_irq, 0, driver_name, udc)) {
> + retval = devm_request_irq(dev,
> + gpio_to_irq(udc->board.vbus_pin),
> + at91_vbus_irq, 0, driver_name, udc);
> + if (retval) {
> DBG("request vbus irq %d failed\n",
> udc->board.vbus_pin);
> - retval = -EBUSY;
> - goto fail3;
> + goto err_unprepare_iclk;
> }
> }
> } else {
> @@ -1832,44 +1827,27 @@ static int at91udc_probe(struct platform_device *pdev)
> }
> retval = usb_add_gadget_udc(dev, &udc->gadget);
> if (retval)
> - goto fail4;
> + goto err_unprepare_iclk;
> dev_set_drvdata(dev, udc);
> device_init_wakeup(dev, 1);
> create_debug_file(udc);
>
> INFO("%s version %s\n", driver_name, DRIVER_VERSION);
> return 0;
> -fail4:
> - if (gpio_is_valid(udc->board.vbus_pin) && !udc->board.vbus_polled)
> - free_irq(gpio_to_irq(udc->board.vbus_pin), udc);
> -fail3:
> - if (gpio_is_valid(udc->board.vbus_pin))
> - gpio_free(udc->board.vbus_pin);
> -fail2:
> - free_irq(udc->udp_irq, udc);
> -fail1c:
> +
> +err_unprepare_iclk:
> clk_unprepare(udc->iclk);
> -fail1b:
> +err_unprepare_fclk:
> clk_unprepare(udc->fclk);
> -fail1:
> - if (!IS_ERR(udc->fclk))
> - clk_put(udc->fclk);
> - if (!IS_ERR(udc->iclk))
> - clk_put(udc->iclk);
> - iounmap(udc->udp_baseaddr);
> -fail0a:
> - if (cpu_is_at91rm9200())
> - gpio_free(udc->board.pullup_pin);
> -fail0:
> - release_mem_region(res->start, resource_size(res));
> +
> DBG("%s probe failed, %d\n", driver_name, retval);
> +
> return retval;
> }
>
> static int __exit at91udc_remove(struct platform_device *pdev)
> {
> struct at91_udc *udc = platform_get_drvdata(pdev);
> - struct resource *res;
> unsigned long flags;
>
> DBG("remove\n");
> @@ -1884,25 +1862,9 @@ static int __exit at91udc_remove(struct platform_device *pdev)
>
> device_init_wakeup(&pdev->dev, 0);
> remove_debug_file(udc);
> - if (gpio_is_valid(udc->board.vbus_pin)) {
> - free_irq(gpio_to_irq(udc->board.vbus_pin), udc);
> - gpio_free(udc->board.vbus_pin);
> - }
> - free_irq(udc->udp_irq, udc);
> - iounmap(udc->udp_baseaddr);
> -
> - if (cpu_is_at91rm9200())
> - gpio_free(udc->board.pullup_pin);
> -
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - release_mem_region(res->start, resource_size(res));
> -
> clk_unprepare(udc->fclk);
> clk_unprepare(udc->iclk);
>
> - clk_put(udc->iclk);
> - clk_put(udc->fclk);
> -
> return 0;
> }
>
> --
> 2.1.0
>
--
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150114/3fa93941/attachment.sig>
WARNING: multiple messages have this Message-ID (diff)
From: Felipe Balbi <balbi@ti.com>
To: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: Felipe Balbi <balbi@ti.com>,
Boris Brezillon <boris.brezillon@free-electrons.com>,
Nicolas Ferre <nicolas.ferre@atmel.com>,
Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
Arnd Bergmann <arnd@arndb.de>, <linux-usb@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
Jean-Jacques Hiblot <jjhiblot@traphandler.com>
Subject: Re: [PATCH 09/12] usb: gadget: at91_udc: Simplify probe and remove functions
Date: Wed, 14 Jan 2015 11:38:22 -0600 [thread overview]
Message-ID: <20150114173822.GJ16533@saruman> (raw)
In-Reply-To: <1421252524-24452-10-git-send-email-alexandre.belloni@free-electrons.com>
[-- Attachment #1: Type: text/plain, Size: 6959 bytes --]
On Wed, Jan 14, 2015 at 05:22:01PM +0100, Alexandre Belloni wrote:
> From: Boris Brezillon <boris.brezillon@free-electrons.com>
>
> Make use of devm_ functions to simplify probe and remove code.
>
> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: Felipe Balbi <balbi@ti.com>
> ---
> drivers/usb/gadget/udc/at91_udc.c | 116 +++++++++++++-------------------------
> 1 file changed, 39 insertions(+), 77 deletions(-)
>
> diff --git a/drivers/usb/gadget/udc/at91_udc.c b/drivers/usb/gadget/udc/at91_udc.c
> index be7e16037ac4..4dba2c65dfd4 100644
> --- a/drivers/usb/gadget/udc/at91_udc.c
> +++ b/drivers/usb/gadget/udc/at91_udc.c
> @@ -1710,15 +1710,6 @@ static int at91udc_probe(struct platform_device *pdev)
> int retval;
> struct resource *res;
>
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - if (!res)
> - return -ENXIO;
> -
> - if (!request_mem_region(res->start, resource_size(res), driver_name)) {
> - DBG("someone's using UDC memory\n");
> - return -EBUSY;
> - }
> -
> /* init software state */
> udc = &controller;
> udc->gadget.dev.parent = dev;
> @@ -1731,13 +1722,13 @@ static int at91udc_probe(struct platform_device *pdev)
> if (cpu_is_at91rm9200()) {
> if (!gpio_is_valid(udc->board.pullup_pin)) {
> DBG("no D+ pullup?\n");
> - retval = -ENODEV;
> - goto fail0;
> + return -ENODEV;
> }
> - retval = gpio_request(udc->board.pullup_pin, "udc_pullup");
> + retval = devm_gpio_request(dev, udc->board.pullup_pin,
> + "udc_pullup");
> if (retval) {
> DBG("D+ pullup is busy\n");
> - goto fail0;
> + return retval;
> }
> gpio_direction_output(udc->board.pullup_pin,
> udc->board.pullup_active_low);
> @@ -1756,32 +1747,32 @@ static int at91udc_probe(struct platform_device *pdev)
> udc->ep[3].maxpacket = 64;
> }
>
> - udc->udp_baseaddr = ioremap(res->start, resource_size(res));
> - if (!udc->udp_baseaddr) {
> - retval = -ENOMEM;
> - goto fail0a;
> - }
> + res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> + udc->udp_baseaddr = devm_ioremap_resource(dev, res);
> + if (IS_ERR(udc->udp_baseaddr))
> + return PTR_ERR(udc->udp_baseaddr);
>
> udc_reinit(udc);
>
> /* get interface and function clocks */
> - udc->iclk = clk_get(dev, "pclk");
> - udc->fclk = clk_get(dev, "hclk");
> - if (IS_ERR(udc->iclk) || IS_ERR(udc->fclk)) {
> - DBG("clocks missing\n");
> - retval = -ENODEV;
> - goto fail1;
> - }
> + udc->iclk = devm_clk_get(dev, "pclk");
> + if (IS_ERR(udc->iclk))
> + return PTR_ERR(udc->iclk);
> +
> + udc->fclk = devm_clk_get(dev, "hclk");
> + if (IS_ERR(udc->fclk))
> + return PTR_ERR(udc->fclk);
>
> /* don't do anything until we have both gadget driver and VBUS */
> clk_set_rate(udc->fclk, 48000000);
> retval = clk_prepare(udc->fclk);
> if (retval)
> - goto fail1;
> + return retval;
>
> retval = clk_prepare_enable(udc->iclk);
> if (retval)
> - goto fail1b;
> + goto err_unprepare_fclk;
> +
> 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. */
> @@ -1790,18 +1781,21 @@ static int at91udc_probe(struct platform_device *pdev)
>
> /* request UDC and maybe VBUS irqs */
> udc->udp_irq = platform_get_irq(pdev, 0);
> - retval = request_irq(udc->udp_irq, at91_udc_irq,
> - 0, driver_name, udc);
> - if (retval < 0) {
> + retval = devm_request_irq(dev, udc->udp_irq, at91_udc_irq, 0,
> + driver_name, udc);
> + if (retval) {
> DBG("request irq %d failed\n", udc->udp_irq);
> - goto fail1c;
> + goto err_unprepare_iclk;
> }
> +
> if (gpio_is_valid(udc->board.vbus_pin)) {
> - retval = gpio_request(udc->board.vbus_pin, "udc_vbus");
> - if (retval < 0) {
> + retval = devm_gpio_request(dev, udc->board.vbus_pin,
> + "udc_vbus");
> + if (retval) {
> DBG("request vbus pin failed\n");
> - goto fail2;
> + goto err_unprepare_iclk;
> }
> +
> gpio_direction_input(udc->board.vbus_pin);
>
> /*
> @@ -1818,12 +1812,13 @@ static int at91udc_probe(struct platform_device *pdev)
> mod_timer(&udc->vbus_timer,
> jiffies + VBUS_POLL_TIMEOUT);
> } else {
> - if (request_irq(gpio_to_irq(udc->board.vbus_pin),
> - at91_vbus_irq, 0, driver_name, udc)) {
> + retval = devm_request_irq(dev,
> + gpio_to_irq(udc->board.vbus_pin),
> + at91_vbus_irq, 0, driver_name, udc);
> + if (retval) {
> DBG("request vbus irq %d failed\n",
> udc->board.vbus_pin);
> - retval = -EBUSY;
> - goto fail3;
> + goto err_unprepare_iclk;
> }
> }
> } else {
> @@ -1832,44 +1827,27 @@ static int at91udc_probe(struct platform_device *pdev)
> }
> retval = usb_add_gadget_udc(dev, &udc->gadget);
> if (retval)
> - goto fail4;
> + goto err_unprepare_iclk;
> dev_set_drvdata(dev, udc);
> device_init_wakeup(dev, 1);
> create_debug_file(udc);
>
> INFO("%s version %s\n", driver_name, DRIVER_VERSION);
> return 0;
> -fail4:
> - if (gpio_is_valid(udc->board.vbus_pin) && !udc->board.vbus_polled)
> - free_irq(gpio_to_irq(udc->board.vbus_pin), udc);
> -fail3:
> - if (gpio_is_valid(udc->board.vbus_pin))
> - gpio_free(udc->board.vbus_pin);
> -fail2:
> - free_irq(udc->udp_irq, udc);
> -fail1c:
> +
> +err_unprepare_iclk:
> clk_unprepare(udc->iclk);
> -fail1b:
> +err_unprepare_fclk:
> clk_unprepare(udc->fclk);
> -fail1:
> - if (!IS_ERR(udc->fclk))
> - clk_put(udc->fclk);
> - if (!IS_ERR(udc->iclk))
> - clk_put(udc->iclk);
> - iounmap(udc->udp_baseaddr);
> -fail0a:
> - if (cpu_is_at91rm9200())
> - gpio_free(udc->board.pullup_pin);
> -fail0:
> - release_mem_region(res->start, resource_size(res));
> +
> DBG("%s probe failed, %d\n", driver_name, retval);
> +
> return retval;
> }
>
> static int __exit at91udc_remove(struct platform_device *pdev)
> {
> struct at91_udc *udc = platform_get_drvdata(pdev);
> - struct resource *res;
> unsigned long flags;
>
> DBG("remove\n");
> @@ -1884,25 +1862,9 @@ static int __exit at91udc_remove(struct platform_device *pdev)
>
> device_init_wakeup(&pdev->dev, 0);
> remove_debug_file(udc);
> - if (gpio_is_valid(udc->board.vbus_pin)) {
> - free_irq(gpio_to_irq(udc->board.vbus_pin), udc);
> - gpio_free(udc->board.vbus_pin);
> - }
> - free_irq(udc->udp_irq, udc);
> - iounmap(udc->udp_baseaddr);
> -
> - if (cpu_is_at91rm9200())
> - gpio_free(udc->board.pullup_pin);
> -
> - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> - release_mem_region(res->start, resource_size(res));
> -
> clk_unprepare(udc->fclk);
> clk_unprepare(udc->iclk);
>
> - clk_put(udc->iclk);
> - clk_put(udc->fclk);
> -
> return 0;
> }
>
> --
> 2.1.0
>
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2015-01-14 17:38 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-14 16:21 [PATCH 00/12] Atmel matrix, SMC and UDC rework Alexandre Belloni
2015-01-14 16:21 ` Alexandre Belloni
2015-01-14 16:21 ` [PATCH 01/12] mfd: syscon: Add atmel-matrix registers definition Alexandre Belloni
2015-01-14 16:21 ` Alexandre Belloni
2015-01-18 12:52 ` Lee Jones
2015-01-18 12:52 ` Lee Jones
2015-01-18 13:11 ` Boris Brezillon
2015-01-18 13:11 ` Boris Brezillon
2015-01-19 8:16 ` Lee Jones
2015-01-19 8:16 ` Lee Jones
2015-01-14 16:21 ` [PATCH 02/12] mfd: syscon: Add Atmel Matrix bus DT binding documentation Alexandre Belloni
2015-01-14 16:21 ` Alexandre Belloni
2015-01-18 12:53 ` Lee Jones
2015-01-18 12:53 ` Lee Jones
2015-01-14 16:21 ` [PATCH 03/12] mfd: syscon: Add atmel-smc registers definition Alexandre Belloni
2015-01-14 16:21 ` Alexandre Belloni
2015-01-18 12:53 ` Lee Jones
2015-01-18 12:53 ` Lee Jones
2015-01-14 16:21 ` [PATCH 04/12] mfd: syscon: Add Atmel SMC binding doc Alexandre Belloni
2015-01-14 16:21 ` Alexandre Belloni
2015-01-18 12:54 ` Lee Jones
2015-01-18 12:54 ` Lee Jones
2015-01-14 16:21 ` [PATCH 05/12] usb: gadget: at91_udc: Fix clock names Alexandre Belloni
2015-01-14 16:21 ` Alexandre Belloni
2015-01-14 17:37 ` Felipe Balbi
2015-01-14 17:37 ` Felipe Balbi
2015-01-14 16:21 ` [PATCH 06/12] usb: gadget: at91_udc: Drop uclk clock Alexandre Belloni
2015-01-14 16:21 ` Alexandre Belloni
2015-01-14 17:37 ` Felipe Balbi
2015-01-14 17:37 ` Felipe Balbi
2015-01-14 16:21 ` [PATCH 07/12] usb: gadget: at91_udc: Document DT clocks and clock-names property Alexandre Belloni
2015-01-14 16:21 ` Alexandre Belloni
2015-01-14 16:22 ` [PATCH 08/12] usb: gadget: at91_udc: Remove non-DT handling code Alexandre Belloni
2015-01-14 16:22 ` Alexandre Belloni
2015-01-14 17:38 ` Felipe Balbi
2015-01-14 17:38 ` Felipe Balbi
2015-01-14 18:35 ` Alexandre Belloni
2015-01-14 18:35 ` Alexandre Belloni
2015-01-14 18:39 ` Felipe Balbi
2015-01-14 18:39 ` Felipe Balbi
2015-01-14 16:22 ` [PATCH 09/12] usb: gadget: at91_udc: Simplify probe and remove functions Alexandre Belloni
2015-01-14 16:22 ` Alexandre Belloni
2015-01-14 17:38 ` Felipe Balbi [this message]
2015-01-14 17:38 ` Felipe Balbi
2015-01-14 16:22 ` [PATCH 10/12] usb: gadget: at91_udc: Rework for multi-platform kernel support Alexandre Belloni
2015-01-14 16:22 ` Alexandre Belloni
2015-01-14 17:38 ` Felipe Balbi
2015-01-14 17:38 ` Felipe Balbi
2015-01-14 16:22 ` [PATCH 11/12] usb: gadget: at91_udc: Update DT binding documentation Alexandre Belloni
2015-01-14 16:22 ` Alexandre Belloni
2015-01-14 16:22 ` [PATCH 12/12] usb: gadget: at91_udc: Allocate udc instance Alexandre Belloni
2015-01-14 16:22 ` Alexandre Belloni
2015-01-14 17:39 ` Felipe Balbi
2015-01-14 17:39 ` Felipe Balbi
2015-01-15 13:30 ` [PATCH 00/12] Atmel matrix, SMC and UDC rework Nicolas Ferre
2015-01-15 13:30 ` 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=20150114173822.GJ16533@saruman \
--to=balbi@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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: link
Be 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.