lkml.org 
[lkml]   [2012]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V2 3/9] ata/pata_arasan: Remove conditional compilation of clk code
    Date
    With addition of dummy clk_*() calls for non CONFIG_HAVE_CLK cases in clk.h,
    there is no need to have clk code enclosed in #ifdef CONFIG_HAVE_CLK, #endif
    macros.

    Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
    Cc: Jeff Garzik <jgarzik@redhat.com>
    Cc: linux-ide@vger.kernel.org
    ---
    drivers/ata/pata_arasan_cf.c | 39 ++++++++++++++++-----------------------
    1 files changed, 16 insertions(+), 23 deletions(-)

    diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
    index fc2db2a..b370e35 100644
    --- a/drivers/ata/pata_arasan_cf.c
    +++ b/drivers/ata/pata_arasan_cf.c
    @@ -184,10 +184,8 @@
    struct arasan_cf_dev {
    /* pointer to ata_host structure */
    struct ata_host *host;
    - /* clk structure, only if HAVE_CLK is defined */
    -#ifdef CONFIG_HAVE_CLK
    + /* clk structure */
    struct clk *clk;
    -#endif

    /* physical base address of controller */
    dma_addr_t pbase;
    @@ -312,13 +310,13 @@ static int cf_init(struct arasan_cf_dev *acdev)
    unsigned long flags;
    int ret = 0;

    -#ifdef CONFIG_HAVE_CLK
    - ret = clk_enable(acdev->clk);
    - if (ret) {
    - dev_dbg(acdev->host->dev, "clock enable failed");
    - return ret;
    + if (!IS_ERR(acdev->clk)) {
    + ret = clk_enable(acdev->clk);
    + if (ret) {
    + dev_dbg(acdev->host->dev, "clock enable failed");
    + return ret;
    + }
    }
    -#endif

    spin_lock_irqsave(&acdev->host->lock, flags);
    /* configure CF interface clock */
    @@ -344,9 +342,9 @@ static void cf_exit(struct arasan_cf_dev *acdev)
    writel(readl(acdev->vbase + OP_MODE) & ~CFHOST_ENB,
    acdev->vbase + OP_MODE);
    spin_unlock_irqrestore(&acdev->host->lock, flags);
    -#ifdef CONFIG_HAVE_CLK
    - clk_disable(acdev->clk);
    -#endif
    +
    + if (!IS_ERR(acdev->clk))
    + clk_disable(acdev->clk);
    }

    static void dma_callback(void *dev)
    @@ -828,13 +826,9 @@ static int __devinit arasan_cf_probe(struct platform_device *pdev)
    return -ENOMEM;
    }

    -#ifdef CONFIG_HAVE_CLK
    acdev->clk = clk_get(&pdev->dev, NULL);
    - if (IS_ERR(acdev->clk)) {
    + if (IS_ERR(acdev->clk))
    dev_warn(&pdev->dev, "Clock not found\n");
    - return PTR_ERR(acdev->clk);
    - }
    -#endif

    /* allocate host */
    host = ata_host_alloc(&pdev->dev, 1);
    @@ -899,9 +893,8 @@ static int __devinit arasan_cf_probe(struct platform_device *pdev)
    &arasan_cf_sht);

    free_clk:
    -#ifdef CONFIG_HAVE_CLK
    - clk_put(acdev->clk);
    -#endif
    + if (!IS_ERR(acdev->clk))
    + clk_put(acdev->clk);
    return ret;
    }

    @@ -912,9 +905,9 @@ static int __devexit arasan_cf_remove(struct platform_device *pdev)

    ata_host_detach(host);
    cf_exit(acdev);
    -#ifdef CONFIG_HAVE_CLK
    - clk_put(acdev->clk);
    -#endif
    +
    + if (!IS_ERR(acdev->clk))
    + clk_put(acdev->clk);

    return 0;
    }
    --
    1.7.9


    \
     
     \ /
      Last update: 2012-04-24 08:15    [W:3.150 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site