lkml.org 
[lkml]   [2009]   [Oct]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] Cleanup: indent/format errors, printk calls.
    Date
    ---
    drivers/staging/comedi/drivers/pcmad.c | 20 +++++++++-----------
    1 files changed, 9 insertions(+), 11 deletions(-)

    diff --git a/drivers/staging/comedi/drivers/pcmad.c b/drivers/staging/comedi/drivers/pcmad.c
    index acac670..43283c2 100644
    --- a/drivers/staging/comedi/drivers/pcmad.c
    +++ b/drivers/staging/comedi/drivers/pcmad.c
    @@ -34,11 +34,11 @@ Configuration options:
    [0] - I/O port base
    [1] - unused
    [2] - Analog input reference
    - 0 = single ended
    - 1 = differential
    + 0 = single ended
    + 1 = differential
    [3] - Analog input encoding (must match jumpers)
    - 0 = straight binary
    - 1 = two's complement
    + 0 = straight binary
    + 1 = two's complement
    */

    #include <linux/interrupt.h>
    @@ -113,9 +113,8 @@ static int pcmad_ai_insn_read(struct comedi_device *dev,
    data[n] = inb(dev->iobase + PCMAD_LSB);
    data[n] |= (inb(dev->iobase + PCMAD_MSB) << 8);

    - if (devpriv->twos_comp) {
    + if (devpriv->twos_comp)
    data[n] ^= (1 << (this_board->n_ai_bits - 1));
    - }
    }

    return n;
    @@ -135,9 +134,9 @@ static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it)
    unsigned long iobase;

    iobase = it->options[0];
    - printk("comedi%d: pcmad: 0x%04lx ", dev->minor, iobase);
    if (!request_region(iobase, PCMAD_SIZE, "pcmad")) {
    - printk("I/O port conflict\n");
    + printk(KERN_ERR "comedi%d: pcmad: 0x%04lx: I/O port conflict\n",
    + dev->minor, iobase);
    return -EIO;
    }
    dev->iobase = iobase;
    @@ -166,11 +165,10 @@ static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it)

    static int pcmad_detach(struct comedi_device *dev)
    {
    - printk("comedi%d: pcmad: remove\n", dev->minor);
    + printk(KERN_NOTICE "comedi%d: pcmad: remove\n", dev->minor);

    - if (dev->irq) {
    + if (dev->irq)
    free_irq(dev->irq, dev);
    - }
    if (dev->iobase)
    release_region(dev->iobase, PCMAD_SIZE);

    --
    1.6.2.5


    \
     
     \ /
      Last update: 2009-10-09 22:29    [W:0.022 / U:0.284 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site