git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
block
/
paride
/
pseudo.h
diff --git
a/drivers/block/paride/pseudo.h
b/drivers/block/paride/pseudo.h
index
932342d
..
bc37032
100644
(file)
--- a/
drivers/block/paride/pseudo.h
+++ b/
drivers/block/paride/pseudo.h
@@
-35,7
+35,7
@@
#include <linux/sched.h>
#include <linux/workqueue.h>
#include <linux/sched.h>
#include <linux/workqueue.h>
-static void ps_tq_int(
void *data
);
+static void ps_tq_int(
struct work_struct *work
);
static void (* ps_continuation)(void);
static int (* ps_ready)(void);
static void (* ps_continuation)(void);
static int (* ps_ready)(void);
@@
-45,7
+45,7
@@
static int ps_nice = 0;
static DEFINE_SPINLOCK(ps_spinlock __attribute__((unused)));
static DEFINE_SPINLOCK(ps_spinlock __attribute__((unused)));
-static DECLARE_
WORK(ps_tq, ps_tq_int, NULL
);
+static DECLARE_
DELAYED_WORK(ps_tq, ps_tq_int
);
static void ps_set_intr(void (*continuation)(void),
int (*ready)(void),
static void ps_set_intr(void (*continuation)(void),
int (*ready)(void),
@@
-63,14
+63,14
@@
static void ps_set_intr(void (*continuation)(void),
if (!ps_tq_active) {
ps_tq_active = 1;
if (!ps_nice)
if (!ps_tq_active) {
ps_tq_active = 1;
if (!ps_nice)
- schedule_
work(&ps_tq
);
+ schedule_
delayed_work(&ps_tq, 0
);
else
schedule_delayed_work(&ps_tq, ps_nice-1);
}
spin_unlock_irqrestore(&ps_spinlock,flags);
}
else
schedule_delayed_work(&ps_tq, ps_nice-1);
}
spin_unlock_irqrestore(&ps_spinlock,flags);
}
-static void ps_tq_int(
void *data
)
+static void ps_tq_int(
struct work_struct *work
)
{
void (*con)(void);
unsigned long flags;
{
void (*con)(void);
unsigned long flags;
@@
-92,7
+92,7
@@
static void ps_tq_int(void *data)
}
ps_tq_active = 1;
if (!ps_nice)
}
ps_tq_active = 1;
if (!ps_nice)
- schedule_
work(&ps_tq
);
+ schedule_
delayed_work(&ps_tq, 0
);
else
schedule_delayed_work(&ps_tq, ps_nice-1);
spin_unlock_irqrestore(&ps_spinlock,flags);
else
schedule_delayed_work(&ps_tq, ps_nice-1);
spin_unlock_irqrestore(&ps_spinlock,flags);