aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorKulikov Vasiliy <segooon@gmail.com>2010-06-29 06:15:09 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-10 16:47:44 -0400
commit2b50d24760a7c0b62180e6fb5a44c2ce3db66abd (patch)
treea6a3672ba5ebf2cd070d5adb145fc33c3533df98 /drivers/char
parent61fd15262bb9c88a05fd89af22add9317dc1b1f4 (diff)
tty_io: remove casts from void*
Remove unnesessary casts from void*. Signed-off-by: Kulikov Vasiliy <segooon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/tty_io.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 4c4030c12d3a..0350c42375a2 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -893,7 +893,7 @@ static ssize_t tty_read(struct file *file, char __user *buf, size_t count,
893 struct inode *inode; 893 struct inode *inode;
894 struct tty_ldisc *ld; 894 struct tty_ldisc *ld;
895 895
896 tty = (struct tty_struct *)file->private_data; 896 tty = file->private_data;
897 inode = file->f_path.dentry->d_inode; 897 inode = file->f_path.dentry->d_inode;
898 if (tty_paranoia_check(tty, inode, "tty_read")) 898 if (tty_paranoia_check(tty, inode, "tty_read"))
899 return -EIO; 899 return -EIO;
@@ -1070,7 +1070,7 @@ static ssize_t tty_write(struct file *file, const char __user *buf,
1070 ssize_t ret; 1070 ssize_t ret;
1071 struct tty_ldisc *ld; 1071 struct tty_ldisc *ld;
1072 1072
1073 tty = (struct tty_struct *)file->private_data; 1073 tty = file->private_data;
1074 if (tty_paranoia_check(tty, inode, "tty_write")) 1074 if (tty_paranoia_check(tty, inode, "tty_write"))
1075 return -EIO; 1075 return -EIO;
1076 if (!tty || !tty->ops->write || 1076 if (!tty || !tty->ops->write ||
@@ -1513,7 +1513,7 @@ int tty_release(struct inode *inode, struct file *filp)
1513 int idx; 1513 int idx;
1514 char buf[64]; 1514 char buf[64];
1515 1515
1516 tty = (struct tty_struct *)filp->private_data; 1516 tty = filp->private_data;
1517 if (tty_paranoia_check(tty, inode, "tty_release_dev")) 1517 if (tty_paranoia_check(tty, inode, "tty_release_dev"))
1518 return 0; 1518 return 0;
1519 1519
@@ -1920,7 +1920,7 @@ static unsigned int tty_poll(struct file *filp, poll_table *wait)
1920 struct tty_ldisc *ld; 1920 struct tty_ldisc *ld;
1921 int ret = 0; 1921 int ret = 0;
1922 1922
1923 tty = (struct tty_struct *)filp->private_data; 1923 tty = filp->private_data;
1924 if (tty_paranoia_check(tty, filp->f_path.dentry->d_inode, "tty_poll")) 1924 if (tty_paranoia_check(tty, filp->f_path.dentry->d_inode, "tty_poll"))
1925 return 0; 1925 return 0;
1926 1926
@@ -1937,7 +1937,7 @@ static int __tty_fasync(int fd, struct file *filp, int on)
1937 unsigned long flags; 1937 unsigned long flags;
1938 int retval = 0; 1938 int retval = 0;
1939 1939
1940 tty = (struct tty_struct *)filp->private_data; 1940 tty = filp->private_data;
1941 if (tty_paranoia_check(tty, filp->f_path.dentry->d_inode, "tty_fasync")) 1941 if (tty_paranoia_check(tty, filp->f_path.dentry->d_inode, "tty_fasync"))
1942 goto out; 1942 goto out;
1943 1943
@@ -2497,7 +2497,7 @@ long tty_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
2497 struct tty_ldisc *ld; 2497 struct tty_ldisc *ld;
2498 struct inode *inode = file->f_dentry->d_inode; 2498 struct inode *inode = file->f_dentry->d_inode;
2499 2499
2500 tty = (struct tty_struct *)file->private_data; 2500 tty = file->private_data;
2501 if (tty_paranoia_check(tty, inode, "tty_ioctl")) 2501 if (tty_paranoia_check(tty, inode, "tty_ioctl"))
2502 return -EINVAL; 2502 return -EINVAL;
2503 2503