lkml.org 
[lkml]   [2011]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/5] ARM: etm: Don't require clock control
    Date
    If clk_get fail, assume the etb does not need a separate clock.

    Signed-off-by: Arve Hjønnevåg <arve@android.com>
    ---
    arch/arm/kernel/etm.c | 14 +++++++-------
    1 files changed, 7 insertions(+), 7 deletions(-)

    diff --git a/arch/arm/kernel/etm.c b/arch/arm/kernel/etm.c
    index 11db628..308b733 100644
    --- a/arch/arm/kernel/etm.c
    +++ b/arch/arm/kernel/etm.c
    @@ -362,12 +362,10 @@ static int __init etb_probe(struct amba_device *dev, struct amba_id *id)
    goto out_unmap;

    t->emu_clk = clk_get(&dev->dev, "emu_src_ck");
    - if (IS_ERR(t->emu_clk)) {
    + if (IS_ERR(t->emu_clk))
    dev_dbg(&dev->dev, "Failed to obtain emu_src_ck.\n");
    - return -EFAULT;
    - }
    -
    - clk_enable(t->emu_clk);
    + else
    + clk_enable(t->emu_clk);

    etb_unlock(t);
    t->etb_bufsz = etb_readl(t, ETBR_DEPTH);
    @@ -402,8 +400,10 @@ static int etb_remove(struct amba_device *dev)
    iounmap(t->etb_regs);
    t->etb_regs = NULL;

    - clk_disable(t->emu_clk);
    - clk_put(t->emu_clk);
    + if (!IS_ERR(t->emu_clk)) {
    + clk_disable(t->emu_clk);
    + clk_put(t->emu_clk);
    + }

    amba_release_regions(dev);

    --
    1.7.3.1
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2011-02-03 03:57    [W:3.910 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site