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>

diff --git a/drivers/staging/pohmelfs/config.c b/drivers/staging/pohmelfs/config.c
index a6eaa42fb66980c4fa3596249b30e0cd81c82f0c..99ae1d9649a0172b850ebf7a231f86f6c8ffabdb 100644 (file)
--- a/drivers/staging/pohmelfs/config.c
+++ b/drivers/staging/pohmelfs/config.c
@@ -446,9 +446,8 @@ out_unlock:
        return err;
 }
 
-static void pohmelfs_cn_callback(void *data)
+static void pohmelfs_cn_callback(struct cn_msg *msg)
 {
-       struct cn_msg *msg = data;
        int err;
 
        switch (msg->flags) {

diff --git a/drivers/staging/pohmelfs/dir.c b/drivers/staging/pohmelfs/dir.c
index 4c58e22c1fbe2c07a305c167ea8e590200bcd4b4..4c63a4cc1bd4c52456dbda9462db03a9ff8a60a1 100644 (file)
--- 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)
                                __func__, file->f_pos, pi->ino, n->data, n->len,
                                n->ino, n->mode, mode, file->f_pos, n->hash);
 
-               file->private_data = (void *)n->hash;
+               file->private_data = (void *)(unsigned long)n->hash;
 
                len = n->len;
                err = filldir(dirent, n->data, n->len, file->f_pos, n->ino, mode);