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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
s390
/
char
/
tape_3590.c
diff --git
a/drivers/s390/char/tape_3590.c
b/drivers/s390/char/tape_3590.c
index
928cbef
..
9df912f
100644
(file)
--- a/
drivers/s390/char/tape_3590.c
+++ b/
drivers/s390/char/tape_3590.c
@@
-236,9
+236,10
@@
struct work_handler_data {
};
static void
};
static void
-tape_3590_work_handler(
void *data
)
+tape_3590_work_handler(
struct work_struct *work
)
{
{
- struct work_handler_data *p = data;
+ struct work_handler_data *p =
+ container_of(work, struct work_handler_data, work);
switch (p->op) {
case TO_MSEN:
switch (p->op) {
case TO_MSEN:
@@
-263,7
+264,7
@@
tape_3590_schedule_work(struct tape_device *device, enum tape_op op)
if ((p = kzalloc(sizeof(*p), GFP_ATOMIC)) == NULL)
return -ENOMEM;
if ((p = kzalloc(sizeof(*p), GFP_ATOMIC)) == NULL)
return -ENOMEM;
- INIT_WORK(&p->work, tape_3590_work_handler
, p
);
+ INIT_WORK(&p->work, tape_3590_work_handler);
p->device = tape_get_device_reference(device);
p->op = op;
p->device = tape_get_device_reference(device);
p->op = op;