Commit bc2955dd authored by Graham M Howe's avatar Graham M Howe Committed by Greg Kroah-Hartman

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: default avatarGraham M Howe <gman.1352@googlemail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent cd9d25ba
...@@ -329,11 +329,11 @@ static uint16_t ni_atmio_win_in(struct comedi_device *dev, int addr) ...@@ -329,11 +329,11 @@ static uint16_t ni_atmio_win_in(struct comedi_device *dev, int addr)
} }
static struct pnp_device_id device_ids[] = { static struct pnp_device_id device_ids[] = {
{.id = "NIC1900",.driver_data = 0}, {.id = "NIC1900", .driver_data = 0},
{.id = "NIC2400",.driver_data = 0}, {.id = "NIC2400", .driver_data = 0},
{.id = "NIC2500",.driver_data = 0}, {.id = "NIC2500", .driver_data = 0},
{.id = "NIC2600",.driver_data = 0}, {.id = "NIC2600", .driver_data = 0},
{.id = "NIC2700",.driver_data = 0}, {.id = "NIC2700", .driver_data = 0},
{.id = ""} {.id = ""}
}; };
...@@ -362,9 +362,9 @@ static int ni_atmio_detach(struct comedi_device *dev) ...@@ -362,9 +362,9 @@ static int ni_atmio_detach(struct comedi_device *dev)
if (dev->iobase) if (dev->iobase)
release_region(dev->iobase, NI_SIZE); release_region(dev->iobase, NI_SIZE);
if (dev->irq) { if (dev->irq)
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
}
if (devpriv->isapnp_dev) if (devpriv->isapnp_dev)
pnp_device_detach(devpriv->isapnp_dev); pnp_device_detach(devpriv->isapnp_dev);
...@@ -387,8 +387,8 @@ static int ni_isapnp_find_board(struct pnp_dev **dev) ...@@ -387,8 +387,8 @@ static int ni_isapnp_find_board(struct pnp_dev **dev)
if (pnp_device_attach(isapnp_dev) < 0) { if (pnp_device_attach(isapnp_dev) < 0) {
printk printk
("ni_atmio: %s found but already active, skipping.\n", ("ni_atmio: %s found but already active, skipping.\n",
ni_boards[i].name); ni_boards[i].name);
continue; continue;
} }
if (pnp_activate_dev(isapnp_dev) < 0) { if (pnp_activate_dev(isapnp_dev) < 0) {
...@@ -496,9 +496,9 @@ static int ni_atmio_attach(struct comedi_device *dev, ...@@ -496,9 +496,9 @@ static int ni_atmio_attach(struct comedi_device *dev,
/* generic E series stuff in ni_mio_common.c */ /* generic E series stuff in ni_mio_common.c */
ret = ni_E_init(dev, it); ret = ni_E_init(dev, it);
if (ret < 0) { if (ret < 0)
return ret; return ret;
}
return 0; return 0;
} }
...@@ -509,16 +509,16 @@ static int ni_getboardtype(struct comedi_device *dev) ...@@ -509,16 +509,16 @@ static int ni_getboardtype(struct comedi_device *dev)
int i; int i;
for (i = 0; i < n_ni_boards; 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; return i;
}
} }
if (device_id == 255) { if (device_id == 255)
printk(" can't find board\n"); 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"); printk(" EEPROM read error (?) or device not found\n");
} else { else
printk(" unknown device ID %d -- contact author\n", device_id); printk(" unknown device ID %d -- contact author\n", device_id);
}
return -1; return -1;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment