aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2008-11-19 13:08:14 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-06 16:52:24 -0500
commit246c541822cd6251aa38862f8f13412e5147a1ad (patch)
treebc12fc6e9f630871d925f6984aac7f5d282e12cb
parentff534766e4b9e25e6e4a1f133946dfa8cfe6a747 (diff)
Staging: comedi: fix sparse issues in comedi_bond.c
This fixes the issues raised by the sparse tool on the comedi_bond.c file. Cc: Calin A. Culianu <calin@ajvar.org> Cc: David Schleef <ds@schleef.org> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/comedi/drivers/comedi_bond.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/comedi_bond.c b/drivers/staging/comedi/drivers/comedi_bond.c
index 4ded9b15c760..9e5496f4f1ae 100644
--- a/drivers/staging/comedi/drivers/comedi_bond.c
+++ b/drivers/staging/comedi/drivers/comedi_bond.c
@@ -103,7 +103,7 @@ MODULE_LICENSE("GPL");
103# define STR(x) STR1(x) 103# define STR(x) STR1(x)
104#endif 104#endif
105 105
106int debug; 106static int debug;
107module_param(debug, int, 0644); 107module_param(debug, int, 0644);
108MODULE_PARM_DESC(debug, "If true, print extra cryptic debugging output useful" 108MODULE_PARM_DESC(debug, "If true, print extra cryptic debugging output useful"
109 "only to developers."); 109 "only to developers.");
@@ -408,7 +408,7 @@ static int doDevConfig(comedi_device *dev, comedi_devconfig *it)
408 int minor = it->options[i]; 408 int minor = it->options[i];
409 comedi_t *d; 409 comedi_t *d;
410 int sdev = -1, nchans, tmp; 410 int sdev = -1, nchans, tmp;
411 struct BondedDevice *bdev = 0; 411 struct BondedDevice *bdev = NULL;
412 412
413 if (minor < 0 || minor > COMEDI_NUM_BOARD_MINORS) { 413 if (minor < 0 || minor > COMEDI_NUM_BOARD_MINORS) {
414 ERROR("Minor %d is invalid!\n", minor); 414 ERROR("Minor %d is invalid!\n", minor);
@@ -515,18 +515,18 @@ static void doDevUnconfig(comedi_device *dev)
515 kfree(bdev); 515 kfree(bdev);
516 } 516 }
517 kfree(devpriv->devs); 517 kfree(devpriv->devs);
518 devpriv->devs = 0; 518 devpriv->devs = NULL;
519 kfree(devpriv); 519 kfree(devpriv);
520 dev->private = 0; 520 dev->private = NULL;
521 } 521 }
522} 522}
523 523
524int __init init(void) 524static int __init init(void)
525{ 525{
526 return comedi_driver_register(&driver_bonding); 526 return comedi_driver_register(&driver_bonding);
527} 527}
528 528
529void __exit cleanup(void) 529static void __exit cleanup(void)
530{ 530{
531 comedi_driver_unregister(&driver_bonding); 531 comedi_driver_unregister(&driver_bonding);
532} 532}