aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorGraham M Howe <gman.1352@googlemail.com>2010-02-13 15:21:43 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-03 19:42:58 -0500
commitbc2955ddf48d2da94019680fa46deae88d39b40e (patch)
treea7da70e47317187ca458aa073d9f4e0c0a0709cb /drivers/staging
parentcd9d25ba31b2def7f84da1e3cedf21e8ebb90722 (diff)
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 <gman.1352@googlemail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/comedi/drivers/ni_atmio.c34
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 8ead31164d5..003d00b595b 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)
329} 329}
330 330
331static struct pnp_device_id device_ids[] = { 331static struct pnp_device_id device_ids[] = {
332 {.id = "NIC1900",.driver_data = 0}, 332 {.id = "NIC1900", .driver_data = 0},
333 {.id = "NIC2400",.driver_data = 0}, 333 {.id = "NIC2400", .driver_data = 0},
334 {.id = "NIC2500",.driver_data = 0}, 334 {.id = "NIC2500", .driver_data = 0},
335 {.id = "NIC2600",.driver_data = 0}, 335 {.id = "NIC2600", .driver_data = 0},
336 {.id = "NIC2700",.driver_data = 0}, 336 {.id = "NIC2700", .driver_data = 0},
337 {.id = ""} 337 {.id = ""}
338}; 338};
339 339
@@ -362,9 +362,9 @@ static int ni_atmio_detach(struct comedi_device *dev)
362 362
363 if (dev->iobase) 363 if (dev->iobase)
364 release_region(dev->iobase, NI_SIZE); 364 release_region(dev->iobase, NI_SIZE);
365 if (dev->irq) { 365 if (dev->irq)
366 free_irq(dev->irq, dev); 366 free_irq(dev->irq, dev);
367 } 367
368 if (devpriv->isapnp_dev) 368 if (devpriv->isapnp_dev)
369 pnp_device_detach(devpriv->isapnp_dev); 369 pnp_device_detach(devpriv->isapnp_dev);
370 370
@@ -387,8 +387,8 @@ static int ni_isapnp_find_board(struct pnp_dev **dev)
387 387
388 if (pnp_device_attach(isapnp_dev) < 0) { 388 if (pnp_device_attach(isapnp_dev) < 0) {
389 printk 389 printk
390 ("ni_atmio: %s found but already active, skipping.\n", 390 ("ni_atmio: %s found but already active, skipping.\n",
391 ni_boards[i].name); 391 ni_boards[i].name);
392 continue; 392 continue;
393 } 393 }
394 if (pnp_activate_dev(isapnp_dev) < 0) { 394 if (pnp_activate_dev(isapnp_dev) < 0) {
@@ -496,9 +496,9 @@ static int ni_atmio_attach(struct comedi_device *dev,
496 /* generic E series stuff in ni_mio_common.c */ 496 /* generic E series stuff in ni_mio_common.c */
497 497
498 ret = ni_E_init(dev, it); 498 ret = ni_E_init(dev, it);
499 if (ret < 0) { 499 if (ret < 0)
500 return ret; 500 return ret;
501 } 501
502 502
503 return 0; 503 return 0;
504} 504}
@@ -509,16 +509,16 @@ static int ni_getboardtype(struct comedi_device *dev)
509 int i; 509 int i;
510 510
511 for (i = 0; i < n_ni_boards; i++) { 511 for (i = 0; i < n_ni_boards; i++) {
512 if (ni_boards[i].device_id == device_id) { 512 if (ni_boards[i].device_id == device_id)
513 return i; 513 return i;
514 } 514
515 } 515 }
516 if (device_id == 255) { 516 if (device_id == 255)
517 printk(" can't find board\n"); 517 printk(" can't find board\n");
518 } else if (device_id == 0) { 518 else if (device_id == 0)
519 printk(" EEPROM read error (?) or device not found\n"); 519 printk(" EEPROM read error (?) or device not found\n");
520 } else { 520 else
521 printk(" unknown device ID %d -- contact author\n", device_id); 521 printk(" unknown device ID %d -- contact author\n", device_id);
522 } 522
523 return -1; 523 return -1;
524} 524}