From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756062Ab0CXMUB (ORCPT ); Wed, 24 Mar 2010 08:20:01 -0400 Received: from mail-fx0-f223.google.com ([209.85.220.223]:35128 "EHLO mail-fx0-f223.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755889Ab0CXMT7 convert rfc822-to-8bit (ORCPT ); Wed, 24 Mar 2010 08:19:59 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; b=tV2dHB6u8lerRf6EkFraaUSoQAK5G3QtpL10rvM7dOGqqW0THfFK6/93WF/O7nD9nB OkvVCoaFe5uO4xpZKsl3WCVALhn/iK/IgEyOgGOIuUBaBklYYaiHiesKauRxpAuIfn20 zR5YYyPJvd/aAHZD55rxCe/M9YkDDcP5AEAKg= MIME-Version: 1.0 In-Reply-To: <1269432269-3417-1-git-send-email-mauricedawson2699@googlemail.com> References: <1269432269-3417-1-git-send-email-mauricedawson2699@googlemail.com> From: =?ISO-8859-1?Q?G=E1bor_Stefanik?= Date: Wed, 24 Mar 2010 13:19:38 +0100 Message-ID: <69e28c911003240519r1915f0fcid869f741ecad3c12@mail.gmail.com> Subject: Re: [PATCH 23/23] Staging: comedi: fix brace, print(k), indent and over 80 character coding style issues in adq12b.c To: Maurice Dawson Cc: gregkh@suse.de, wfp5p@virginia.edu, mithlesh@linsyssoft.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Mar 24, 2010 at 1:04 PM, Maurice Dawson wrote: > This is a patch to the adq12b.c file that fixes up brace, print(k), indent and over 80 character warnings found by the checkpatch.pl tool > > Signed-off-by: Maurice Dawson > --- >  drivers/staging/comedi/drivers/adq12b.c |   30 +++++++++++++++++------------- >  1 files changed, 17 insertions(+), 13 deletions(-) > > diff --git a/drivers/staging/comedi/drivers/adq12b.c b/drivers/staging/comedi/drivers/adq12b.c > index 00b2009..ac3d42d 100644 > --- a/drivers/staging/comedi/drivers/adq12b.c > +++ b/drivers/staging/comedi/drivers/adq12b.c > @@ -200,19 +200,21 @@ static int adq12b_attach(struct comedi_device *dev, struct comedi_devconfig *it) >        unipolar = it->options[1]; >        differential = it->options[2]; > > -       printk("comedi%d: adq12b called with options base=0x%03lx, %s and %s\n", > +       printk(KERN_ERR "comedi%d: adq12b called with options base=0x%03lx, " > +                                                               "%s and %s\n", >               dev->minor, iobase, (unipolar == 1) ? "unipolar" : "bipolar", >               (differential == 1) ? "differential" : "single-ended"); > >        /* if no address was specified, try the default 0x300 */ >        if (iobase == 0) { > -               printk > -                   ("comedi%d: adq12b warning: I/O base address not specified. Trying the default 0x300.\n", > -                    dev->minor); > +               printk("comedi%d: adq12b warning: " > +                       "I/O base address not specified. " > +                       "Trying the default 0x300.\n", > +                                               dev->minor); >                iobase = 0x300; >        } > > -       printk("comedi%d: adq12b: 0x%04lx ", dev->minor, iobase); > +       printk(KERN_ERR "comedi%d: adq12b: 0x%04lx ", dev->minor, iobase); >        if (!request_region(iobase, ADQ12B_SIZE, "adq12b")) { >                printk("I/O port conflict\n"); >                return -EIO; > @@ -259,11 +261,10 @@ static int adq12b_attach(struct comedi_device *dev, struct comedi_devconfig *it) >                s->n_chan = thisboard->ai_se_chans; >        } > > -       if (unipolar) { > +       if (unipolar) >                s->range_table = &range_adq12b_ai_unipolar; > -       } else { > +       else >                s->range_table = &range_adq12b_ai_bipolar; > -       } > >        s->maxdata = (1 << thisboard->ai_bits) - 1; > > @@ -289,7 +290,7 @@ static int adq12b_attach(struct comedi_device *dev, struct comedi_devconfig *it) >        s->range_table = &range_digital; >        s->insn_bits = adq12b_do_insn_bits; > > -       printk("attached\n"); > +       printk(KERN_ERR "attached\n"); > >        return 0; >  } > @@ -309,7 +310,7 @@ static int adq12b_detach(struct comedi_device *dev) > >        kfree(devpriv); > > -       printk("comedi%d: adq12b: removed\n", dev->minor); > +       printk(KERN_ERR "comedi%d: adq12b: removed\n", dev->minor); > >        return 0; >  } > @@ -344,17 +345,20 @@ static int adq12b_ai_rinsn(struct comedi_device *dev, >                /* wait for end of convertion */ >                i = 0; >                do { > -/* udelay(1); */ > +                       /* udelay(1); */ >                        status = inb(dev->iobase + ADQ12B_STINR); >                        status = status & ADQ12B_EOC; >                } while (status == 0 && ++i < TIMEOUT); > -/* } while (++i < 10); */ > +                       /* } while (++i < 10); */ > >                /* read data */ >                hi = inb(dev->iobase + ADQ12B_ADHIG); >                lo = inb(dev->iobase + ADQ12B_ADLOW); > > -               /* printk("debug: chan=%d range=%d status=%d hi=%d lo=%d\n", channel, range, status,  hi, lo); */ > +               /* > +                *printk("debug: chan=%d range=%d status=%d hi=%d lo=%d\n", > +                *channel, range, status,  hi, lo); > +                */ AFAIK this is not the right way to format commented-out code - not sure if we prefer plain /*...*/ or #if 0...#endif in such cases, but definitely not boxed comments. >                data[n] = (hi << 8) | lo; > >        } > -- > 1.6.3.3 > > _______________________________________________ > devel mailing list > devel@linuxdriverproject.org > http://driverdev.linuxdriverproject.org/mailman/listinfo/devel > -- Vista: [V]iruses, [I]ntruders, [S]pyware, [T]rojans and [A]dware. :-)