projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WorkStruct: make allyesconfig
[deliverable/linux.git]
/
drivers
/
media
/
video
/
saa7134
/
saa7134-empress.c
diff --git
a/drivers/media/video/saa7134/saa7134-empress.c
b/drivers/media/video/saa7134/saa7134-empress.c
index 65d044086ce953b9459b377b53c880aef657f29c..daaae870a2c4eacdb9956f292aac459fd4968fe6 100644
(file)
--- a/
drivers/media/video/saa7134/saa7134-empress.c
+++ b/
drivers/media/video/saa7134/saa7134-empress.c
@@
-343,9
+343,10
@@
static struct video_device saa7134_empress_template =
.minor = -1,
};
.minor = -1,
};
-static void empress_signal_update(
void* data
)
+static void empress_signal_update(
struct work_struct *work
)
{
{
- struct saa7134_dev* dev = (struct saa7134_dev*) data;
+ struct saa7134_dev* dev =
+ container_of(work, struct saa7134_dev, empress_workqueue);
if (dev->nosignal) {
dprintk("no video signal\n");
if (dev->nosignal) {
dprintk("no video signal\n");
@@
-378,7
+379,7
@@
static int empress_init(struct saa7134_dev *dev)
"%s empress (%s)", dev->name,
saa7134_boards[dev->board].name);
"%s empress (%s)", dev->name,
saa7134_boards[dev->board].name);
- INIT_WORK(&dev->empress_workqueue, empress_signal_update
, (void*) dev
);
+ INIT_WORK(&dev->empress_workqueue, empress_signal_update);
err = video_register_device(dev->empress_dev,VFL_TYPE_GRABBER,
empress_nr[dev->nr]);
err = video_register_device(dev->empress_dev,VFL_TYPE_GRABBER,
empress_nr[dev->nr]);
@@
-399,7
+400,7
@@
static int empress_init(struct saa7134_dev *dev)
sizeof(struct saa7134_buf),
dev);
sizeof(struct saa7134_buf),
dev);
- empress_signal_update(
dev
);
+ empress_signal_update(
&dev->empress_workqueue
);
return 0;
}
return 0;
}
This page took
0.025988 seconds
and
5
git commands to generate.