forked from Minki/linux
[PATCH] openpromfs: remove unnecessary casts
Remove unnecessary casts in fs/openpromfs/inode.c Signed-off-by: Jan Engelhardt <jengelh@gmx.de> Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
0928d68056
commit
515decdccf
@ -72,7 +72,7 @@ static ssize_t nodenum_read(struct file *file, char __user *buf,
|
||||
|
||||
if (count < 0 || !inode->u.generic_ip)
|
||||
return -EINVAL;
|
||||
sprintf (buffer, "%8.8x\n", (u32)(long)(inode->u.generic_ip));
|
||||
sprintf (buffer, "%8.8lx\n", (long)inode->u.generic_ip);
|
||||
if (file->f_pos >= 9)
|
||||
return 0;
|
||||
if (count > 9 - file->f_pos)
|
||||
@ -123,7 +123,7 @@ static ssize_t property_read(struct file *filp, char __user *buf,
|
||||
GFP_KERNEL);
|
||||
if (!filp->private_data)
|
||||
return -ENOMEM;
|
||||
op = (openprom_property *)filp->private_data;
|
||||
op = filp->private_data;
|
||||
op->flag = 0;
|
||||
op->alloclen = 2 * i;
|
||||
strcpy (op->name, p);
|
||||
@ -163,7 +163,7 @@ static ssize_t property_read(struct file *filp, char __user *buf,
|
||||
op->len--;
|
||||
}
|
||||
} else
|
||||
op = (openprom_property *)filp->private_data;
|
||||
op = filp->private_data;
|
||||
if (!count || !(op->len || (op->flag & OPP_ASCIIZ)))
|
||||
return 0;
|
||||
if (*ppos >= 0xffffff || count >= 0xffffff)
|
||||
@ -335,7 +335,7 @@ static ssize_t property_write(struct file *filp, const char __user *buf,
|
||||
return i;
|
||||
}
|
||||
k = *ppos;
|
||||
op = (openprom_property *)filp->private_data;
|
||||
op = filp->private_data;
|
||||
if (!(op->flag & OPP_STRING)) {
|
||||
u32 *first, *last;
|
||||
int first_off, last_cnt;
|
||||
@ -388,13 +388,13 @@ static ssize_t property_write(struct file *filp, const char __user *buf,
|
||||
memcpy (b, filp->private_data,
|
||||
sizeof (openprom_property)
|
||||
+ strlen (op->name) + op->alloclen);
|
||||
memset (((char *)b) + sizeof (openprom_property)
|
||||
memset (b + sizeof (openprom_property)
|
||||
+ strlen (op->name) + op->alloclen,
|
||||
0, 2 * i - op->alloclen);
|
||||
op = (openprom_property *)b;
|
||||
op = b;
|
||||
op->alloclen = 2*i;
|
||||
b = filp->private_data;
|
||||
filp->private_data = (void *)op;
|
||||
filp->private_data = op;
|
||||
kfree (b);
|
||||
}
|
||||
first = ((u32 *)op->value) + (k / 9);
|
||||
@ -498,13 +498,13 @@ write_try_string:
|
||||
memcpy (b, filp->private_data,
|
||||
sizeof (openprom_property)
|
||||
+ strlen (op->name) + op->alloclen);
|
||||
memset (((char *)b) + sizeof (openprom_property)
|
||||
memset (b + sizeof (openprom_property)
|
||||
+ strlen (op->name) + op->alloclen,
|
||||
0, 2*(count - *ppos) - op->alloclen);
|
||||
op = (openprom_property *)b;
|
||||
op = b;
|
||||
op->alloclen = 2*(count + *ppos);
|
||||
b = filp->private_data;
|
||||
filp->private_data = (void *)op;
|
||||
filp->private_data = op;
|
||||
kfree (b);
|
||||
}
|
||||
p = op->value + *ppos - ((op->flag & OPP_QUOTED) ? 1 : 0);
|
||||
@ -533,7 +533,7 @@ write_try_string:
|
||||
|
||||
int property_release (struct inode *inode, struct file *filp)
|
||||
{
|
||||
openprom_property *op = (openprom_property *)filp->private_data;
|
||||
openprom_property *op = filp->private_data;
|
||||
int error;
|
||||
u32 node;
|
||||
|
||||
@ -932,7 +932,7 @@ static int __init check_space (u16 n)
|
||||
return -1;
|
||||
|
||||
if (nodes) {
|
||||
memcpy ((char *)pages, (char *)nodes,
|
||||
memcpy ((char *)pages, nodes,
|
||||
(1 << alloced) * PAGE_SIZE);
|
||||
free_pages ((unsigned long)nodes, alloced);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user