git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bnx2x: Removing old PHY FW upgrade code
[safe/jmp/linux-2.6]
/
drivers
/
mfd
/
ucb1x00-ts.c
diff --git
a/drivers/mfd/ucb1x00-ts.c
b/drivers/mfd/ucb1x00-ts.c
index
2d03bf7
..
61b7d3e
100644
(file)
--- a/
drivers/mfd/ucb1x00-ts.c
+++ b/
drivers/mfd/ucb1x00-ts.c
@@
-21,7
+21,6
@@
#include <linux/moduleparam.h>
#include <linux/init.h>
#include <linux/smp.h>
#include <linux/moduleparam.h>
#include <linux/init.h>
#include <linux/smp.h>
-#include <linux/smp_lock.h>
#include <linux/sched.h>
#include <linux/completion.h>
#include <linux/delay.h>
#include <linux/sched.h>
#include <linux/completion.h>
#include <linux/delay.h>
@@
-32,9
+31,8
@@
#include <linux/slab.h>
#include <linux/kthread.h>
#include <linux/slab.h>
#include <linux/kthread.h>
-#include <asm/dma.h>
-#include <asm/semaphore.h>
-#include <asm/arch/collie.h>
+#include <mach/dma.h>
+#include <mach/collie.h>
#include <asm/mach-types.h>
#include "ucb1x00.h"
#include <asm/mach-types.h>
#include "ucb1x00.h"
@@
-206,10
+204,10
@@
static inline int ucb1x00_ts_pen_down(struct ucb1x00_ts *ts)
static int ucb1x00_thread(void *_ts)
{
struct ucb1x00_ts *ts = _ts;
static int ucb1x00_thread(void *_ts)
{
struct ucb1x00_ts *ts = _ts;
- struct task_struct *tsk = current;
- DECLARE_WAITQUEUE(wait, tsk);
+ DECLARE_WAITQUEUE(wait, current);
int valid = 0;
int valid = 0;
+ set_freezable();
add_wait_queue(&ts->irq_wait, &wait);
while (!kthread_should_stop()) {
unsigned int x, y, p;
add_wait_queue(&ts->irq_wait, &wait);
while (!kthread_should_stop()) {
unsigned int x, y, p;
@@
-235,7
+233,7
@@
static int ucb1x00_thread(void *_ts)
if (ucb1x00_ts_pen_down(ts)) {
if (ucb1x00_ts_pen_down(ts)) {
- set_
task_state(tsk,
TASK_INTERRUPTIBLE);
+ set_
current_state(
TASK_INTERRUPTIBLE);
ucb1x00_enable_irq(ts->ucb, UCB_IRQ_TSPX, machine_is_collie() ? UCB_RISING : UCB_FALLING);
ucb1x00_disable(ts->ucb);
ucb1x00_enable_irq(ts->ucb, UCB_IRQ_TSPX, machine_is_collie() ? UCB_RISING : UCB_FALLING);
ucb1x00_disable(ts->ucb);
@@
-263,7
+261,7
@@
static int ucb1x00_thread(void *_ts)
valid = 1;
}
valid = 1;
}
- set_
task_state(tsk,
TASK_INTERRUPTIBLE);
+ set_
current_state(
TASK_INTERRUPTIBLE);
timeout = HZ / 100;
}
timeout = HZ / 100;
}