lkml.org 
[lkml]   [2010]   [Feb]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/3] Staging: comedi: bracing fix to ni_atmio.c This is a patch to ni_atmio.c file to fix up bracing style problems found by checkpatch.pl tool Signed-off-by: Graham M Howe <>
    Date
    From: root <root@graham-eeepc.(none)>

    ---
    drivers/staging/comedi/drivers/ni_atmio.c | 34 ++++++++++++++--------------
    1 files changed, 17 insertions(+), 17 deletions(-)

    diff --git a/drivers/staging/comedi/drivers/ni_atmio.c b/drivers/staging/comedi/drivers/ni_atmio.c
    index 8ead311..003d00b 100644
    --- a/drivers/staging/comedi/drivers/ni_atmio.c
    +++ b/drivers/staging/comedi/drivers/ni_atmio.c
    @@ -329,11 +329,11 @@ static uint16_t ni_atmio_win_in(struct comedi_device *dev, int addr)
    }

    static struct pnp_device_id device_ids[] = {
    - {.id = "NIC1900",.driver_data = 0},
    - {.id = "NIC2400",.driver_data = 0},
    - {.id = "NIC2500",.driver_data = 0},
    - {.id = "NIC2600",.driver_data = 0},
    - {.id = "NIC2700",.driver_data = 0},
    + {.id = "NIC1900", .driver_data = 0},
    + {.id = "NIC2400", .driver_data = 0},
    + {.id = "NIC2500", .driver_data = 0},
    + {.id = "NIC2600", .driver_data = 0},
    + {.id = "NIC2700", .driver_data = 0},
    {.id = ""}
    };

    @@ -362,9 +362,9 @@ static int ni_atmio_detach(struct comedi_device *dev)

    if (dev->iobase)
    release_region(dev->iobase, NI_SIZE);
    - if (dev->irq) {
    + if (dev->irq)
    free_irq(dev->irq, dev);
    - }
    +
    if (devpriv->isapnp_dev)
    pnp_device_detach(devpriv->isapnp_dev);

    @@ -387,8 +387,8 @@ static int ni_isapnp_find_board(struct pnp_dev **dev)

    if (pnp_device_attach(isapnp_dev) < 0) {
    printk
    - ("ni_atmio: %s found but already active, skipping.\n",
    - ni_boards[i].name);
    + ("ni_atmio: %s found but already active, skipping.\n",
    + ni_boards[i].name);
    continue;
    }
    if (pnp_activate_dev(isapnp_dev) < 0) {
    @@ -496,9 +496,9 @@ static int ni_atmio_attach(struct comedi_device *dev,
    /* generic E series stuff in ni_mio_common.c */

    ret = ni_E_init(dev, it);
    - if (ret < 0) {
    + if (ret < 0)
    return ret;
    - }
    +

    return 0;
    }
    @@ -509,16 +509,16 @@ static int ni_getboardtype(struct comedi_device *dev)
    int i;

    for (i = 0; i < n_ni_boards; i++) {
    - if (ni_boards[i].device_id == device_id) {
    + if (ni_boards[i].device_id == device_id)
    return i;
    - }
    +
    }
    - if (device_id == 255) {
    + if (device_id == 255)
    printk(" can't find board\n");
    - } else if (device_id == 0) {
    + else if (device_id == 0)
    printk(" EEPROM read error (?) or device not found\n");
    - } else {
    + else
    printk(" unknown device ID %d -- contact author\n", device_id);
    - }
    +
    return -1;
    }
    --
    1.6.3.3


    \
     
     \ /
      Last update: 2010-02-13 21:25    [W:0.030 / U:151.848 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site