diff options
| -rw-r--r-- | arch/ia64/kernel/perfmon.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c index cce050e85c73..6b1852f7f972 100644 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c | |||
| @@ -1573,7 +1573,7 @@ pfm_read(struct file *filp, char __user *buf, size_t size, loff_t *ppos) | |||
| 1573 | return -EINVAL; | 1573 | return -EINVAL; |
| 1574 | } | 1574 | } |
| 1575 | 1575 | ||
| 1576 | ctx = (pfm_context_t *)filp->private_data; | 1576 | ctx = filp->private_data; |
| 1577 | if (ctx == NULL) { | 1577 | if (ctx == NULL) { |
| 1578 | printk(KERN_ERR "perfmon: pfm_read: NULL ctx [%d]\n", task_pid_nr(current)); | 1578 | printk(KERN_ERR "perfmon: pfm_read: NULL ctx [%d]\n", task_pid_nr(current)); |
| 1579 | return -EINVAL; | 1579 | return -EINVAL; |
| @@ -1673,7 +1673,7 @@ pfm_poll(struct file *filp, poll_table * wait) | |||
| 1673 | return 0; | 1673 | return 0; |
| 1674 | } | 1674 | } |
| 1675 | 1675 | ||
| 1676 | ctx = (pfm_context_t *)filp->private_data; | 1676 | ctx = filp->private_data; |
| 1677 | if (ctx == NULL) { | 1677 | if (ctx == NULL) { |
| 1678 | printk(KERN_ERR "perfmon: pfm_poll: NULL ctx [%d]\n", task_pid_nr(current)); | 1678 | printk(KERN_ERR "perfmon: pfm_poll: NULL ctx [%d]\n", task_pid_nr(current)); |
| 1679 | return 0; | 1679 | return 0; |
| @@ -1733,7 +1733,7 @@ pfm_fasync(int fd, struct file *filp, int on) | |||
| 1733 | return -EBADF; | 1733 | return -EBADF; |
| 1734 | } | 1734 | } |
| 1735 | 1735 | ||
| 1736 | ctx = (pfm_context_t *)filp->private_data; | 1736 | ctx = filp->private_data; |
| 1737 | if (ctx == NULL) { | 1737 | if (ctx == NULL) { |
| 1738 | printk(KERN_ERR "perfmon: pfm_fasync NULL ctx [%d]\n", task_pid_nr(current)); | 1738 | printk(KERN_ERR "perfmon: pfm_fasync NULL ctx [%d]\n", task_pid_nr(current)); |
| 1739 | return -EBADF; | 1739 | return -EBADF; |
| @@ -1841,7 +1841,7 @@ pfm_flush(struct file *filp, fl_owner_t id) | |||
| 1841 | return -EBADF; | 1841 | return -EBADF; |
| 1842 | } | 1842 | } |
| 1843 | 1843 | ||
| 1844 | ctx = (pfm_context_t *)filp->private_data; | 1844 | ctx = filp->private_data; |
| 1845 | if (ctx == NULL) { | 1845 | if (ctx == NULL) { |
| 1846 | printk(KERN_ERR "perfmon: pfm_flush: NULL ctx [%d]\n", task_pid_nr(current)); | 1846 | printk(KERN_ERR "perfmon: pfm_flush: NULL ctx [%d]\n", task_pid_nr(current)); |
| 1847 | return -EBADF; | 1847 | return -EBADF; |
| @@ -1984,7 +1984,7 @@ pfm_close(struct inode *inode, struct file *filp) | |||
| 1984 | return -EBADF; | 1984 | return -EBADF; |
| 1985 | } | 1985 | } |
| 1986 | 1986 | ||
| 1987 | ctx = (pfm_context_t *)filp->private_data; | 1987 | ctx = filp->private_data; |
| 1988 | if (ctx == NULL) { | 1988 | if (ctx == NULL) { |
| 1989 | printk(KERN_ERR "perfmon: pfm_close: NULL ctx [%d]\n", task_pid_nr(current)); | 1989 | printk(KERN_ERR "perfmon: pfm_close: NULL ctx [%d]\n", task_pid_nr(current)); |
| 1990 | return -EBADF; | 1990 | return -EBADF; |
| @@ -4907,7 +4907,7 @@ restart_args: | |||
| 4907 | goto error_args; | 4907 | goto error_args; |
| 4908 | } | 4908 | } |
| 4909 | 4909 | ||
| 4910 | ctx = (pfm_context_t *)file->private_data; | 4910 | ctx = file->private_data; |
| 4911 | if (unlikely(ctx == NULL)) { | 4911 | if (unlikely(ctx == NULL)) { |
| 4912 | DPRINT(("no context for fd %d\n", fd)); | 4912 | DPRINT(("no context for fd %d\n", fd)); |
| 4913 | goto error_args; | 4913 | goto error_args; |
