lkml.org 
[lkml]   [2012]   [Jun]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 01/15] ARM: etm: Don't require clock control
    On 06/13/2012 01:33 AM, Paul Mundt wrote:
    > On Tue, Jun 12, 2012 at 07:01:19PM -0700, John Stultz wrote:
    >> diff --git a/arch/arm/kernel/etm.c b/arch/arm/kernel/etm.c
    >> index 36d20bd..bd295e8 100644
    >> --- a/arch/arm/kernel/etm.c
    >> +++ b/arch/arm/kernel/etm.c
    >> @@ -362,13 +362,12 @@ static int __devinit etb_probe(struct amba_device *dev, const struct amba_id *id
    >> if (ret)
    >> goto out_unmap;
    >>
    >> + /* Get optional clock. Currently used to select clock source on omap3 */
    >> 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);
    >>
    > Optionally you could just:
    >
    > if (IS_ERR(t->emu_clk))
    > t->emu_clk = NULL;
    >
    > and use the clk API as you were, as it does handle NULL being passed in.
    >
    > In this case you don't have too many callsites to worry about, but it's
    > reasonably convenient to be able to pass a NULL clk pointer around
    > without constant special-casing when those start to balloon up.
    >
    Hrm. That's a good trick to remember for the future!

    Although in this case I'm not sure it wins much (since the re-adding of
    the braces and the null assignment is still more code then using the
    else). So unless this is a major style problem for you (and do let me
    know if it is), I'll probably leave it alone.

    thanks
    -john



    \
     
     \ /
      Last update: 2012-06-14 02:01    [W:9.020 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site