From 068c73b3d053762f1b641ec23869f51848876382 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 19 Nov 2008 10:08:14 -0800 Subject: [PATCH] --- yaml --- r: 126718 b: refs/heads/master c: 246c541822cd6251aa38862f8f13412e5147a1ad h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/comedi_bond.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index a9489f7a7365..c9569481966c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff534766e4b9e25e6e4a1f133946dfa8cfe6a747 +refs/heads/master: 246c541822cd6251aa38862f8f13412e5147a1ad diff --git a/trunk/drivers/staging/comedi/drivers/comedi_bond.c b/trunk/drivers/staging/comedi/drivers/comedi_bond.c index 4ded9b15c760..9e5496f4f1ae 100644 --- a/trunk/drivers/staging/comedi/drivers/comedi_bond.c +++ b/trunk/drivers/staging/comedi/drivers/comedi_bond.c @@ -103,7 +103,7 @@ MODULE_LICENSE("GPL"); # define STR(x) STR1(x) #endif -int debug; +static int debug; module_param(debug, int, 0644); MODULE_PARM_DESC(debug, "If true, print extra cryptic debugging output useful" "only to developers."); @@ -408,7 +408,7 @@ static int doDevConfig(comedi_device *dev, comedi_devconfig *it) int minor = it->options[i]; comedi_t *d; int sdev = -1, nchans, tmp; - struct BondedDevice *bdev = 0; + struct BondedDevice *bdev = NULL; if (minor < 0 || minor > COMEDI_NUM_BOARD_MINORS) { ERROR("Minor %d is invalid!\n", minor); @@ -515,18 +515,18 @@ static void doDevUnconfig(comedi_device *dev) kfree(bdev); } kfree(devpriv->devs); - devpriv->devs = 0; + devpriv->devs = NULL; kfree(devpriv); - dev->private = 0; + dev->private = NULL; } } -int __init init(void) +static int __init init(void) { return comedi_driver_register(&driver_bonding); } -void __exit cleanup(void) +static void __exit cleanup(void) { comedi_driver_unregister(&driver_bonding); }