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
/
char
/
tpm
/
tpm.c
diff --git
a/drivers/char/tpm/tpm.c
b/drivers/char/tpm/tpm.c
index 6ad2d3bb945c06fc2dc86d92eaa8d2fa410c0308..36f91a655275a6f7481648b8b6273d2537b40e96 100644
(file)
--- a/
drivers/char/tpm/tpm.c
+++ b/
drivers/char/tpm/tpm.c
@@
-325,9
+325,9
@@
static void user_reader_timeout(unsigned long ptr)
schedule_work(&chip->work);
}
schedule_work(&chip->work);
}
-static void timeout_work(
void *ptr
)
+static void timeout_work(
struct work_struct *work
)
{
{
- struct tpm_chip *chip =
ptr
;
+ struct tpm_chip *chip =
container_of(work, struct tpm_chip, work)
;
down(&chip->buffer_mutex);
atomic_set(&chip->data_pending, 0);
down(&chip->buffer_mutex);
atomic_set(&chip->data_pending, 0);
@@
-1105,7
+1105,7
@@
struct tpm_chip *tpm_register_hardware(struct device *dev, const struct tpm_vend
init_MUTEX(&chip->tpm_mutex);
INIT_LIST_HEAD(&chip->list);
init_MUTEX(&chip->tpm_mutex);
INIT_LIST_HEAD(&chip->list);
- INIT_WORK(&chip->work, timeout_work
, chip
);
+ INIT_WORK(&chip->work, timeout_work);
init_timer(&chip->user_read_timer);
chip->user_read_timer.function = user_reader_timeout;
init_timer(&chip->user_read_timer);
chip->user_read_timer.function = user_reader_timeout;
This page took
0.02383 seconds
and
5
git commands to generate.