git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[media] staging: media: lirc: space around operator
[sfrench/cifs-2.6.git]
/
drivers
/
staging
/
media
/
lirc
/
lirc_parallel.c
diff --git
a/drivers/staging/media/lirc/lirc_parallel.c
b/drivers/staging/media/lirc/lirc_parallel.c
index eed6ffac7c90a5b53424c983e670a446828f6350..6e2edb24d9d5d62f3a19f3794adb28c60661cc8e 100644
(file)
--- a/
drivers/staging/media/lirc/lirc_parallel.c
+++ b/
drivers/staging/media/lirc/lirc_parallel.c
@@
-193,7
+193,7
@@
static int lirc_claim(void)
return 0;
}
}
return 0;
}
}
- out(LIRC_LP_CONTROL, LP_PSELECP
|
LP_PINITP);
+ out(LIRC_LP_CONTROL, LP_PSELECP
|
LP_PINITP);
is_claimed = 1;
return 1;
}
is_claimed = 1;
return 1;
}
@@
-264,7
+264,7
@@
static void lirc_lirc_irq_handler(void *blah)
init = 1;
}
init = 1;
}
- timeout = timer
/10;
/* timeout after 1/10 sec. */
+ timeout = timer
/ 10;
/* timeout after 1/10 sec. */
signal = 1;
level = lirc_get_timer();
do {
signal = 1;
level = lirc_get_timer();
do {
@@
-286,7
+286,7
@@
static void lirc_lirc_irq_handler(void *blah)
/* adjust value to usecs */
__u64 helper;
/* adjust value to usecs */
__u64 helper;
- helper = ((__u64)signal)
*
1000000;
+ helper = ((__u64)signal)
*
1000000;
do_div(helper, timer);
signal = (long)helper;
do_div(helper, timer);
signal = (long)helper;
@@
-294,7
+294,7
@@
static void lirc_lirc_irq_handler(void *blah)
data = signal - LIRC_SFH506_DELAY;
else
data = 1;
data = signal - LIRC_SFH506_DELAY;
else
data = 1;
- rbuf_write(PULSE_BIT
|
data); /* pulse */
+ rbuf_write(PULSE_BIT
|
data); /* pulse */
}
lastkt = ktime_get();
#else
}
lastkt = ktime_get();
#else
@@
-331,7
+331,7
@@
static ssize_t lirc_read(struct file *filep, char __user *buf, size_t n,
set_current_state(TASK_INTERRUPTIBLE);
while (count < n) {
if (rptr != wptr) {
set_current_state(TASK_INTERRUPTIBLE);
while (count < n) {
if (rptr != wptr) {
- if (copy_to_user(buf
+
count, &rbuf[rptr],
+ if (copy_to_user(buf
+
count, &rbuf[rptr],
sizeof(int))) {
result = -EFAULT;
break;
sizeof(int))) {
result = -EFAULT;
break;
@@
-393,7
+393,7
@@
static ssize_t lirc_write(struct file *filep, const char __user *buf, size_t n,
for (i = 0; i < count; i++) {
__u64 helper;
for (i = 0; i < count; i++) {
__u64 helper;
- helper = ((__u64)wbuf[i])
*
timer;
+ helper = ((__u64)wbuf[i])
*
timer;
do_div(helper, 1000000);
wbuf[i] = (int)helper;
}
do_div(helper, 1000000);
wbuf[i] = (int)helper;
}
@@
-664,7
+664,7
@@
static int __init lirc_parallel_init(void)
if (parport_claim(ppdevice) != 0)
goto skip_init;
is_claimed = 1;
if (parport_claim(ppdevice) != 0)
goto skip_init;
is_claimed = 1;
- out(LIRC_LP_CONTROL, LP_PSELECP
|
LP_PINITP);
+ out(LIRC_LP_CONTROL, LP_PSELECP
|
LP_PINITP);
#ifdef LIRC_TIMER
if (debug)
#ifdef LIRC_TIMER
if (debug)