diff options
author | Alan Cox <alan@linux.intel.com> | 2009-08-19 12:52:08 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 15:02:26 -0400 |
commit | 106a47ba0a4fcdfa62e7cd708a4284c03e4db05c (patch) | |
tree | 157303b53f02936a3bd6a502759e0794bd4c1b6b /drivers | |
parent | 76efa5e34ed81587e26e483a624dc7f72efb389a (diff) |
Staging: pohmelfs: fix type errors
Signed-off-by: Alan Cox <alan@linux.intel.com>
Cc: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/pohmelfs/config.c | 3 | ||||
-rw-r--r-- | drivers/staging/pohmelfs/dir.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/pohmelfs/config.c b/drivers/staging/pohmelfs/config.c index a6eaa42fb669..99ae1d9649a0 100644 --- a/drivers/staging/pohmelfs/config.c +++ b/drivers/staging/pohmelfs/config.c | |||
@@ -446,9 +446,8 @@ out_unlock: | |||
446 | return err; | 446 | return err; |
447 | } | 447 | } |
448 | 448 | ||
449 | static void pohmelfs_cn_callback(void *data) | 449 | static void pohmelfs_cn_callback(struct cn_msg *msg) |
450 | { | 450 | { |
451 | struct cn_msg *msg = data; | ||
452 | int err; | 451 | int err; |
453 | 452 | ||
454 | switch (msg->flags) { | 453 | switch (msg->flags) { |
diff --git a/drivers/staging/pohmelfs/dir.c b/drivers/staging/pohmelfs/dir.c index 4c58e22c1fbe..4c63a4cc1bd4 100644 --- a/drivers/staging/pohmelfs/dir.c +++ b/drivers/staging/pohmelfs/dir.c | |||
@@ -412,7 +412,7 @@ static int pohmelfs_readdir(struct file *file, void *dirent, filldir_t filldir) | |||
412 | __func__, file->f_pos, pi->ino, n->data, n->len, | 412 | __func__, file->f_pos, pi->ino, n->data, n->len, |
413 | n->ino, n->mode, mode, file->f_pos, n->hash); | 413 | n->ino, n->mode, mode, file->f_pos, n->hash); |
414 | 414 | ||
415 | file->private_data = (void *)n->hash; | 415 | file->private_data = (void *)(unsigned long)n->hash; |
416 | 416 | ||
417 | len = n->len; | 417 | len = n->len; |
418 | err = filldir(dirent, n->data, n->len, file->f_pos, n->ino, mode); | 418 | err = filldir(dirent, n->data, n->len, file->f_pos, n->ino, mode); |