lkml.org 
[lkml]   [2012]   [May]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 RESEND] spi/ep93xx: clean probe/remove routines
    Date
    Use devm_* functions for managing devres resources.

    Also use local variable irq and remove irq variable from
    struct ep93xx_spi, as it is needed only in probe routine.

    Acked-by: Mika Westerberg <mika.westerberg@iki.fi>
    Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
    Signed-off-by: Hannu Heikkinen <hannuxx@iki.fi>
    ---
    drivers/spi/spi-ep93xx.c | 37 ++++++++++---------------------------
    1 file changed, 10 insertions(+), 27 deletions(-)

    diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c
    index e805507..f97f1d2 100644
    --- a/drivers/spi/spi-ep93xx.c
    +++ b/drivers/spi/spi-ep93xx.c
    @@ -76,7 +76,6 @@
    * @clk: clock for the controller
    * @regs_base: pointer to ioremap()'d registers
    * @sspdr_phys: physical address of the SSPDR register
    - * @irq: IRQ number used by the driver
    * @min_rate: minimum clock rate (in Hz) supported by the controller
    * @max_rate: maximum clock rate (in Hz) supported by the controller
    * @running: is the queue running
    @@ -114,7 +113,6 @@ struct ep93xx_spi {
    struct clk *clk;
    void __iomem *regs_base;
    unsigned long sspdr_phys;
    - int irq;
    unsigned long min_rate;
    unsigned long max_rate;
    bool running;
    @@ -1031,6 +1029,7 @@ static int __devinit ep93xx_spi_probe(struct platform_device *pdev)
    struct ep93xx_spi_info *info;
    struct ep93xx_spi *espi;
    struct resource *res;
    + int irq;
    int error;

    info = pdev->dev.platform_data;
    @@ -1070,8 +1069,8 @@ static int __devinit ep93xx_spi_probe(struct platform_device *pdev)
    espi->min_rate = clk_get_rate(espi->clk) / (254 * 256);
    espi->pdev = pdev;

    - espi->irq = platform_get_irq(pdev, 0);
    - if (espi->irq < 0) {
    + irq = platform_get_irq(pdev, 0);
    + if (irq < 0) {
    error = -EBUSY;
    dev_err(&pdev->dev, "failed to get irq resources\n");
    goto fail_put_clock;
    @@ -1084,26 +1083,20 @@ static int __devinit ep93xx_spi_probe(struct platform_device *pdev)
    goto fail_put_clock;
    }

    - res = request_mem_region(res->start, resource_size(res), pdev->name);
    - if (!res) {
    - dev_err(&pdev->dev, "unable to request iomem resources\n");
    - error = -EBUSY;
    - goto fail_put_clock;
    - }
    -
    espi->sspdr_phys = res->start + SSPDR;
    - espi->regs_base = ioremap(res->start, resource_size(res));
    +
    + espi->regs_base = devm_request_and_ioremap(&pdev->dev, res);
    if (!espi->regs_base) {
    dev_err(&pdev->dev, "failed to map resources\n");
    error = -ENODEV;
    - goto fail_free_mem;
    + goto fail_put_clock;
    }

    - error = request_irq(espi->irq, ep93xx_spi_interrupt, 0,
    - "ep93xx-spi", espi);
    + error = devm_request_irq(&pdev->dev, irq, ep93xx_spi_interrupt,
    + 0, "ep93xx-spi", espi);
    if (error) {
    dev_err(&pdev->dev, "failed to request irq\n");
    - goto fail_unmap_regs;
    + goto fail_put_clock;
    }

    if (info->use_dma && ep93xx_spi_setup_dma(espi))
    @@ -1128,7 +1121,7 @@ static int __devinit ep93xx_spi_probe(struct platform_device *pdev)
    }

    dev_info(&pdev->dev, "EP93xx SPI Controller at 0x%08lx irq %d\n",
    - (unsigned long)res->start, espi->irq);
    + (unsigned long)res->start, irq);

    return 0;

    @@ -1136,11 +1129,6 @@ fail_free_queue:
    destroy_workqueue(espi->wq);
    fail_free_dma:
    ep93xx_spi_release_dma(espi);
    - free_irq(espi->irq, espi);
    -fail_unmap_regs:
    - iounmap(espi->regs_base);
    -fail_free_mem:
    - release_mem_region(res->start, resource_size(res));
    fail_put_clock:
    clk_put(espi->clk);
    fail_release_master:
    @@ -1154,7 +1142,6 @@ static int __devexit ep93xx_spi_remove(struct platform_device *pdev)
    {
    struct spi_master *master = platform_get_drvdata(pdev);
    struct ep93xx_spi *espi = spi_master_get_devdata(master);
    - struct resource *res;

    spin_lock_irq(&espi->lock);
    espi->running = false;
    @@ -1180,10 +1167,6 @@ static int __devexit ep93xx_spi_remove(struct platform_device *pdev)
    spin_unlock_irq(&espi->lock);

    ep93xx_spi_release_dma(espi);
    - free_irq(espi->irq, espi);
    - iounmap(espi->regs_base);
    - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
    - release_mem_region(res->start, resource_size(res));
    clk_put(espi->clk);
    platform_set_drvdata(pdev, NULL);

    --
    1.7.10


    \
     
     \ /
      Last update: 2012-05-09 17:02    [W:0.049 / U:60.572 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site