aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi/comedidev.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-04-30 15:26:54 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-11 11:35:57 -0700
commitbaf22b64aa7eb2d32c4ff49262b8d26c18bb232a (patch)
tree3255c5236571e8c235a1cb2771c2772eb657e500 /drivers/staging/comedi/comedidev.h
parent981bdf41ea7bbeece1f08045e0456c725a4d8f2f (diff)
downloadkernel_samsung_smdk4412-baf22b64aa7eb2d32c4ff49262b8d26c18bb232a.zip
kernel_samsung_smdk4412-baf22b64aa7eb2d32c4ff49262b8d26c18bb232a.tar.gz
kernel_samsung_smdk4412-baf22b64aa7eb2d32c4ff49262b8d26c18bb232a.tar.bz2
Staging: comedi: fix coding style issues in comedidev.h
This resolves some coding style issues in comedidev.h And yes, volatile here meant nothing, removing it is ok. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi/comedidev.h')
-rw-r--r--drivers/staging/comedi/comedidev.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index ebdccfd..4e1955b 100644
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -57,7 +57,7 @@
static int __init x ## _init_module(void) \
{return comedi_driver_register(&(x)); } \
static void __exit x ## _cleanup_module(void) \
- {comedi_driver_unregister(&(x)); } \
+ {comedi_driver_unregister(&(x)); } \
module_init(x ## _init_module); \
module_exit(x ## _cleanup_module);
@@ -132,7 +132,7 @@ struct comedi_subdevice {
struct comedi_device *device;
int type;
int n_chan;
- volatile int subdev_flags;
+ int subdev_flags;
int len_chanlist; /* maximum length of channel/gain list */
void *private;
@@ -402,7 +402,7 @@ int insn_inval(struct comedi_device *dev, struct comedi_subdevice *s,
#define RANGE(a, b) {(a)*1e6, (b)*1e6, 0}
#define RANGE_ext(a, b) {(a)*1e6, (b)*1e6, RF_EXTERNAL}
#define RANGE_mA(a, b) {(a)*1e6, (b)*1e6, UNIT_mA}
-#define RANGE_unitless(a, b) {(a)*1e6, (b)*1e6, 0} /* XXX */
+#define RANGE_unitless(a, b) {(a)*1e6, (b)*1e6, 0}
#define BIP_RANGE(a) {-(a)*1e6, (a)*1e6, 0}
#define UNI_RANGE(a) {0, (a)*1e6, 0}