diff options
author | Alexander Beregalov <a.beregalov@gmail.com> | 2009-03-16 12:45:13 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 17:53:28 -0400 |
commit | 451084d2e056ab9ef0ae6afe59556dadc2f416aa (patch) | |
tree | c5c0766bf2acec4b36e868b54b93bd08776003e5 /drivers/staging/meilhaus/me8200_di.c | |
parent | 483f29cc43bf336e7c4cb8cb7aaccc1f55a99e4e (diff) |
Staging: meilhaus: some checkpatch.pl cleanup
Cc: David Kiliani <mail@davidkiliani.de>
Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/meilhaus/me8200_di.c')
-rw-r--r-- | drivers/staging/meilhaus/me8200_di.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/drivers/staging/meilhaus/me8200_di.c b/drivers/staging/meilhaus/me8200_di.c index 6cd75ead9dc..a931fb817c7 100644 --- a/drivers/staging/meilhaus/me8200_di.c +++ b/drivers/staging/meilhaus/me8200_di.c | |||
@@ -34,7 +34,7 @@ | |||
34 | 34 | ||
35 | #include <linux/slab.h> | 35 | #include <linux/slab.h> |
36 | #include <linux/spinlock.h> | 36 | #include <linux/spinlock.h> |
37 | #include <asm/io.h> | 37 | #include <linux/io.h> |
38 | #include <linux/types.h> | 38 | #include <linux/types.h> |
39 | #include <linux/interrupt.h> | 39 | #include <linux/interrupt.h> |
40 | #include <linux/version.h> | 40 | #include <linux/version.h> |
@@ -50,44 +50,44 @@ | |||
50 | 50 | ||
51 | /// Defines | 51 | /// Defines |
52 | static void me8200_di_destructor(struct me_subdevice *subdevice); | 52 | static void me8200_di_destructor(struct me_subdevice *subdevice); |
53 | static int me8200_di_io_irq_start(me_subdevice_t * subdevice, | 53 | static int me8200_di_io_irq_start(me_subdevice_t *subdevice, |
54 | struct file *filep, | 54 | struct file *filep, |
55 | int channel, | 55 | int channel, |
56 | int irq_source, | 56 | int irq_source, |
57 | int irq_edge, int irq_arg, int flags); | 57 | int irq_edge, int irq_arg, int flags); |
58 | static int me8200_di_io_irq_wait(me_subdevice_t * subdevice, | 58 | static int me8200_di_io_irq_wait(me_subdevice_t *subdevice, |
59 | struct file *filep, | 59 | struct file *filep, |
60 | int channel, | 60 | int channel, |
61 | int *irq_count, | 61 | int *irq_count, |
62 | int *value, int time_out, int flags); | 62 | int *value, int time_out, int flags); |
63 | static int me8200_di_io_irq_stop(me_subdevice_t * subdevice, | 63 | static int me8200_di_io_irq_stop(me_subdevice_t *subdevice, |
64 | struct file *filep, int channel, int flags); | 64 | struct file *filep, int channel, int flags); |
65 | static int me8200_di_io_single_config(me_subdevice_t * subdevice, | 65 | static int me8200_di_io_single_config(me_subdevice_t *subdevice, |
66 | struct file *filep, | 66 | struct file *filep, |
67 | int channel, | 67 | int channel, |
68 | int single_config, | 68 | int single_config, |
69 | int ref, | 69 | int ref, |
70 | int trig_chan, | 70 | int trig_chan, |
71 | int trig_type, int trig_edge, int flags); | 71 | int trig_type, int trig_edge, int flags); |
72 | static int me8200_di_io_single_read(me_subdevice_t * subdevice, | 72 | static int me8200_di_io_single_read(me_subdevice_t *subdevice, |
73 | struct file *filep, | 73 | struct file *filep, |
74 | int channel, | 74 | int channel, |
75 | int *value, int time_out, int flags); | 75 | int *value, int time_out, int flags); |
76 | static int me8200_di_io_reset_subdevice(struct me_subdevice *subdevice, | 76 | static int me8200_di_io_reset_subdevice(struct me_subdevice *subdevice, |
77 | struct file *filep, int flags); | 77 | struct file *filep, int flags); |
78 | static int me8200_di_query_number_channels(me_subdevice_t * subdevice, | 78 | static int me8200_di_query_number_channels(me_subdevice_t *subdevice, |
79 | int *number); | 79 | int *number); |
80 | static int me8200_di_query_subdevice_type(me_subdevice_t * subdevice, | 80 | static int me8200_di_query_subdevice_type(me_subdevice_t *subdevice, |
81 | int *type, int *subtype); | 81 | int *type, int *subtype); |
82 | static int me8200_di_query_subdevice_caps(me_subdevice_t * subdevice, | 82 | static int me8200_di_query_subdevice_caps(me_subdevice_t *subdevice, |
83 | int *caps); | 83 | int *caps); |
84 | static irqreturn_t me8200_isr(int irq, void *dev_id); | 84 | static irqreturn_t me8200_isr(int irq, void *dev_id); |
85 | static irqreturn_t me8200_isr_EX(int irq, void *dev_id); | 85 | static irqreturn_t me8200_isr_EX(int irq, void *dev_id); |
86 | static void me8200_di_check_version(me8200_di_subdevice_t * instance, | 86 | static void me8200_di_check_version(me8200_di_subdevice_t *instance, |
87 | unsigned long addr); | 87 | unsigned long addr); |
88 | 88 | ||
89 | ///Functions | 89 | ///Functions |
90 | static int me8200_di_io_irq_start(me_subdevice_t * subdevice, | 90 | static int me8200_di_io_irq_start(me_subdevice_t *subdevice, |
91 | struct file *filep, | 91 | struct file *filep, |
92 | int channel, | 92 | int channel, |
93 | int irq_source, | 93 | int irq_source, |
@@ -238,7 +238,7 @@ static int me8200_di_io_irq_start(me_subdevice_t * subdevice, | |||
238 | return err; | 238 | return err; |
239 | } | 239 | } |
240 | 240 | ||
241 | static int me8200_di_io_irq_wait(me_subdevice_t * subdevice, | 241 | static int me8200_di_io_irq_wait(me_subdevice_t *subdevice, |
242 | struct file *filep, | 242 | struct file *filep, |
243 | int channel, | 243 | int channel, |
244 | int *irq_count, | 244 | int *irq_count, |
@@ -344,7 +344,7 @@ static int me8200_di_io_irq_wait(me_subdevice_t * subdevice, | |||
344 | return err; | 344 | return err; |
345 | } | 345 | } |
346 | 346 | ||
347 | static int me8200_di_io_irq_stop(me_subdevice_t * subdevice, | 347 | static int me8200_di_io_irq_stop(me_subdevice_t *subdevice, |
348 | struct file *filep, int channel, int flags) | 348 | struct file *filep, int channel, int flags) |
349 | { | 349 | { |
350 | me8200_di_subdevice_t *instance; | 350 | me8200_di_subdevice_t *instance; |
@@ -398,7 +398,7 @@ static int me8200_di_io_irq_stop(me_subdevice_t * subdevice, | |||
398 | return ME_ERRNO_SUCCESS; | 398 | return ME_ERRNO_SUCCESS; |
399 | } | 399 | } |
400 | 400 | ||
401 | static int me8200_di_io_single_config(me_subdevice_t * subdevice, | 401 | static int me8200_di_io_single_config(me_subdevice_t *subdevice, |
402 | struct file *filep, | 402 | struct file *filep, |
403 | int channel, | 403 | int channel, |
404 | int single_config, | 404 | int single_config, |
@@ -445,7 +445,7 @@ static int me8200_di_io_single_config(me_subdevice_t * subdevice, | |||
445 | return err; | 445 | return err; |
446 | } | 446 | } |
447 | 447 | ||
448 | static int me8200_di_io_single_read(me_subdevice_t * subdevice, | 448 | static int me8200_di_io_single_read(me_subdevice_t *subdevice, |
449 | struct file *filep, | 449 | struct file *filep, |
450 | int channel, | 450 | int channel, |
451 | int *value, int time_out, int flags) | 451 | int *value, int time_out, int flags) |
@@ -510,7 +510,7 @@ static int me8200_di_io_reset_subdevice(struct me_subdevice *subdevice, | |||
510 | return me8200_di_io_irq_stop(subdevice, filep, 0, 0); | 510 | return me8200_di_io_irq_stop(subdevice, filep, 0, 0); |
511 | } | 511 | } |
512 | 512 | ||
513 | static int me8200_di_query_number_channels(me_subdevice_t * subdevice, | 513 | static int me8200_di_query_number_channels(me_subdevice_t *subdevice, |
514 | int *number) | 514 | int *number) |
515 | { | 515 | { |
516 | PDEBUG("executed.\n"); | 516 | PDEBUG("executed.\n"); |
@@ -518,7 +518,7 @@ static int me8200_di_query_number_channels(me_subdevice_t * subdevice, | |||
518 | return ME_ERRNO_SUCCESS; | 518 | return ME_ERRNO_SUCCESS; |
519 | } | 519 | } |
520 | 520 | ||
521 | static int me8200_di_query_subdevice_type(me_subdevice_t * subdevice, | 521 | static int me8200_di_query_subdevice_type(me_subdevice_t *subdevice, |
522 | int *type, int *subtype) | 522 | int *type, int *subtype) |
523 | { | 523 | { |
524 | PDEBUG("executed.\n"); | 524 | PDEBUG("executed.\n"); |
@@ -527,7 +527,7 @@ static int me8200_di_query_subdevice_type(me_subdevice_t * subdevice, | |||
527 | return ME_ERRNO_SUCCESS; | 527 | return ME_ERRNO_SUCCESS; |
528 | } | 528 | } |
529 | 529 | ||
530 | static int me8200_di_query_subdevice_caps(me_subdevice_t * subdevice, int *caps) | 530 | static int me8200_di_query_subdevice_caps(me_subdevice_t *subdevice, int *caps) |
531 | { | 531 | { |
532 | PDEBUG("executed.\n"); | 532 | PDEBUG("executed.\n"); |
533 | *caps = | 533 | *caps = |
@@ -699,8 +699,8 @@ static void me8200_di_destructor(struct me_subdevice *subdevice) | |||
699 | me8200_di_subdevice_t *me8200_di_constructor(uint32_t me8200_regbase, | 699 | me8200_di_subdevice_t *me8200_di_constructor(uint32_t me8200_regbase, |
700 | unsigned int di_idx, | 700 | unsigned int di_idx, |
701 | int irq, | 701 | int irq, |
702 | spinlock_t * irq_ctrl_lock, | 702 | spinlock_t *irq_ctrl_lock, |
703 | spinlock_t * irq_mode_lock) | 703 | spinlock_t *irq_mode_lock) |
704 | { | 704 | { |
705 | me8200_di_subdevice_t *subdevice; | 705 | me8200_di_subdevice_t *subdevice; |
706 | int err; | 706 | int err; |
@@ -827,7 +827,7 @@ me8200_di_subdevice_t *me8200_di_constructor(uint32_t me8200_regbase, | |||
827 | return subdevice; | 827 | return subdevice; |
828 | } | 828 | } |
829 | 829 | ||
830 | static void me8200_di_check_version(me8200_di_subdevice_t * instance, | 830 | static void me8200_di_check_version(me8200_di_subdevice_t *instance, |
831 | unsigned long addr) | 831 | unsigned long addr) |
832 | { | 832 | { |
833 | 833 | ||