diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2011-01-18 14:03:23 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-01-21 12:27:19 -0800 |
commit | 2a9a05c43294d703e351753da49231c47e0aad0d (patch) | |
tree | f43776db5f6a6c8482f895f464e823440fb17f49 /drivers/staging/easycap/easycap_main.c | |
parent | a9855917290fc40dbfd67d3ee06c190667d6c5b5 (diff) |
Staging: easycap: fix sparse warnings for module parameters
easycap_main.c:34:5: warning: symbol 'easycap_debug' was not declared. Should it be static?
easycap_main.c:36:5: warning: symbol 'easycap_gain' was not declared. Should it be static?
These two variables actually were declared in several places.
The variables are used in several files.
I've fixed "easycap_debug" so it gets declared in one place only and included properly.
For "easycap_gain" made it static and I created added a
->gain member to the easycap struct. This seems cleaner than using a
global variable and later on we may make this controlable via sysfs.
Cc:Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Acked-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/easycap/easycap_main.c')
-rw-r--r-- | drivers/staging/easycap/easycap_main.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/staging/easycap/easycap_main.c b/drivers/staging/easycap/easycap_main.c index 84128cf90007..a0b954cfdd75 100644 --- a/drivers/staging/easycap/easycap_main.c +++ b/drivers/staging/easycap/easycap_main.c @@ -33,7 +33,7 @@ int easycap_debug; static int easycap_bars = 1; -int easycap_gain = 16; +static int easycap_gain = 16; module_param_named(debug, easycap_debug, int, S_IRUGO | S_IWUSR); module_param_named(bars, easycap_bars, int, S_IRUGO | S_IWUSR); module_param_named(gain, easycap_gain, int, S_IRUGO | S_IWUSR); @@ -3412,6 +3412,8 @@ struct v4l2_device *pv4l2_device; #endif /*EASYCAP_IS_VIDEODEV_CLIENT*/ /*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ +/* setup modules params */ + if ((struct usb_interface *)NULL == pusb_interface) { SAY("ERROR: pusb_interface is NULL\n"); return -EFAULT; @@ -3547,6 +3549,9 @@ if (0 == bInterfaceNumber) { "%i=peasycap->kref.refcount.counter\n", \ bInterfaceNumber, peasycap->kref.refcount.counter); + /* module params */ + peasycap->gain = (s8)clamp(easycap_gain, 0, 31); + init_waitqueue_head(&peasycap->wq_video); init_waitqueue_head(&peasycap->wq_audio); init_waitqueue_head(&peasycap->wq_trigger); |