diff options
| author | Greg Dietsche <gregory.dietsche@cuw.edu> | 2011-04-30 15:03:20 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-03 12:09:43 -0700 |
| commit | d713680f2a7a91864e3722420222952f30a0346e (patch) | |
| tree | 5ed1f1654d8e390466361b2283403d5cd4a2f858 /drivers/staging/lirc | |
| parent | 3b70a26bcbe05db12965de702368ca0b9ec945f1 (diff) | |
staging: lirc: fixed coding style
fixed a few minor coding style issues reported by checkpatch.pl
Signed-off-by: Greg Dietsche <gregory.dietsche@cuw.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/lirc')
| -rw-r--r-- | drivers/staging/lirc/lirc_parallel.c | 27 | ||||
| -rw-r--r-- | drivers/staging/lirc/lirc_sir.c | 30 |
2 files changed, 29 insertions, 28 deletions
diff --git a/drivers/staging/lirc/lirc_parallel.c b/drivers/staging/lirc/lirc_parallel.c index 832522c290cb..50724c4e2484 100644 --- a/drivers/staging/lirc/lirc_parallel.c +++ b/drivers/staging/lirc/lirc_parallel.c @@ -568,17 +568,17 @@ static void set_use_dec(void *data) } static struct lirc_driver driver = { - .name = LIRC_DRIVER_NAME, - .minor = -1, - .code_length = 1, - .sample_rate = 0, - .data = NULL, - .add_to_buf = NULL, - .set_use_inc = set_use_inc, - .set_use_dec = set_use_dec, - .fops = &lirc_fops, - .dev = NULL, - .owner = THIS_MODULE, + .name = LIRC_DRIVER_NAME, + .minor = -1, + .code_length = 1, + .sample_rate = 0, + .data = NULL, + .add_to_buf = NULL, + .set_use_inc = set_use_inc, + .set_use_dec = set_use_dec, + .fops = &lirc_fops, + .dev = NULL, + .owner = THIS_MODULE, }; static struct platform_device *lirc_parallel_dev; @@ -594,7 +594,7 @@ static int __devexit lirc_parallel_remove(struct platform_device *dev) } static int lirc_parallel_suspend(struct platform_device *dev, - pm_message_t state) + pm_message_t state) { return 0; } @@ -647,7 +647,8 @@ static int __init lirc_parallel_init(void) result = platform_driver_register(&lirc_parallel_driver); if (result) { - printk("platform_driver_register returned %d\n", result); + printk(KERN_NOTICE "platform_driver_register" + " returned %d\n", result); return result; } diff --git a/drivers/staging/lirc/lirc_sir.c b/drivers/staging/lirc/lirc_sir.c index 76be7b8c6209..a7b46f24f24e 100644 --- a/drivers/staging/lirc/lirc_sir.c +++ b/drivers/staging/lirc/lirc_sir.c @@ -143,9 +143,9 @@ static unsigned int duty_cycle = 50; /* duty cycle of 50% */ #endif #ifndef LIRC_PORT /* for external dongles, default to com1 */ -#if defined(LIRC_SIR_ACTISYS_ACT200L) || \ - defined(LIRC_SIR_ACTISYS_ACT220L) || \ - defined(LIRC_SIR_TEKRAM) +#if defined(LIRC_SIR_ACTISYS_ACT200L) || \ + defined(LIRC_SIR_ACTISYS_ACT220L) || \ + defined(LIRC_SIR_TEKRAM) #define LIRC_PORT 0x3f8 #else /* onboard sir ports are typically com3 */ @@ -467,7 +467,7 @@ static const struct file_operations lirc_fops = { static int set_use_inc(void *data) { - return 0; + return 0; } static void set_use_dec(void *data) @@ -475,17 +475,17 @@ static void set_use_dec(void *data) } static struct lirc_driver driver = { - .name = LIRC_DRIVER_NAME, - .minor = -1, - .code_length = 1, - .sample_rate = 0, - .data = NULL, - .add_to_buf = NULL, - .set_use_inc = set_use_inc, - .set_use_dec = set_use_dec, - .fops = &lirc_fops, - .dev = NULL, - .owner = THIS_MODULE, + .name = LIRC_DRIVER_NAME, + .minor = -1, + .code_length = 1, + .sample_rate = 0, + .data = NULL, + .add_to_buf = NULL, + .set_use_inc = set_use_inc, + .set_use_dec = set_use_dec, + .fops = &lirc_fops, + .dev = NULL, + .owner = THIS_MODULE, }; |