diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2010-09-30 10:24:11 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-05 08:50:15 -0700 |
| commit | 9f1c75ac2dba752ad3734bd3ffab805a6a3fbeda (patch) | |
| tree | 1cc63c6eaf589234d9dfed67163320e263df5e63 /drivers/staging/bcm/Bcmchar.c | |
| parent | 2a953cfd42c00bab00e792422f7c2064c5f0b410 (diff) | |
staging/bcm: fix most build warnings
This removes all warnings I get on a 64 bit build except
for those that look unfixable, where we convert a pointer
to a 32 bit integer and change its byte order!
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/bcm/Bcmchar.c')
| -rw-r--r-- | drivers/staging/bcm/Bcmchar.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c index afde77ae0768..2248ae5f11d0 100644 --- a/drivers/staging/bcm/Bcmchar.c +++ b/drivers/staging/bcm/Bcmchar.c @@ -100,7 +100,7 @@ static int bcm_char_release(struct inode *inode, struct file *filp) return 0; } -static int bcm_char_read(struct file *filp, PCHAR buf, size_t size, loff_t *f_pos) +static ssize_t bcm_char_read(struct file *filp, char __user *buf, size_t size, loff_t *f_pos) { PPER_TARANG_DATA pTarang = (PPER_TARANG_DATA)filp->private_data; PMINI_ADAPTER Adapter = pTarang->Adapter; @@ -153,8 +153,7 @@ static int bcm_char_read(struct file *filp, PCHAR buf, size_t size, loff_t *f_po return PktLen; } -static INT bcm_char_ioctl(struct inode *inode, struct file *filp, - UINT cmd, ULONG arg) +static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) { PPER_TARANG_DATA pTarang = (PPER_TARANG_DATA)filp->private_data; PMINI_ADAPTER Adapter = pTarang->Adapter; @@ -2359,11 +2358,11 @@ static INT bcm_char_ioctl(struct inode *inode, struct file *filp, static struct file_operations bcm_fops = { - .owner = THIS_MODULE, - .open = bcm_char_open, - .release = bcm_char_release, - .read = bcm_char_read, - .unlocked_ioctl = bcm_char_ioctl, + .owner = THIS_MODULE, + .open = bcm_char_open, + .release = bcm_char_release, + .read = bcm_char_read, + .unlocked_ioctl = bcm_char_ioctl, .llseek = no_llseek, }; |