aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/telephony
diff options
context:
space:
mode:
authorJosef Sipek <jsipek@fsl.cs.sunysb.edu>2006-12-08 05:37:14 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:28:46 -0500
commitd1f229744ece0b7aa7ce89ecd1fb598b90305d5b (patch)
tree4554cd1f4c6cdab8d60a060d663102e982330787 /drivers/telephony
parent4482dfad69d783d1df03ed3952838451a249985e (diff)
[PATCH] struct path: convert ixj
Signed-off-by: Josef Sipek <jsipek@fsl.cs.sunysb.edu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/telephony')
-rw-r--r--drivers/telephony/ixj.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c
index 1b601b6cf2a2..df4cc1fb5f68 100644
--- a/drivers/telephony/ixj.c
+++ b/drivers/telephony/ixj.c
@@ -2747,7 +2747,7 @@ static void alaw2ulaw(unsigned char *buff, unsigned long len)
2747static ssize_t ixj_read(struct file * file_p, char __user *buf, size_t length, loff_t * ppos) 2747static ssize_t ixj_read(struct file * file_p, char __user *buf, size_t length, loff_t * ppos)
2748{ 2748{
2749 unsigned long i = *ppos; 2749 unsigned long i = *ppos;
2750 IXJ * j = get_ixj(NUM(file_p->f_dentry->d_inode)); 2750 IXJ * j = get_ixj(NUM(file_p->f_path.dentry->d_inode));
2751 2751
2752 DECLARE_WAITQUEUE(wait, current); 2752 DECLARE_WAITQUEUE(wait, current);
2753 2753
@@ -2804,7 +2804,7 @@ static ssize_t ixj_enhanced_read(struct file * file_p, char __user *buf, size_t
2804{ 2804{
2805 int pre_retval; 2805 int pre_retval;
2806 ssize_t read_retval = 0; 2806 ssize_t read_retval = 0;
2807 IXJ *j = get_ixj(NUM(file_p->f_dentry->d_inode)); 2807 IXJ *j = get_ixj(NUM(file_p->f_path.dentry->d_inode));
2808 2808
2809 pre_retval = ixj_PreRead(j, 0L); 2809 pre_retval = ixj_PreRead(j, 0L);
2810 switch (pre_retval) { 2810 switch (pre_retval) {
@@ -2883,7 +2883,7 @@ static ssize_t ixj_enhanced_write(struct file * file_p, const char __user *buf,
2883 int pre_retval; 2883 int pre_retval;
2884 ssize_t write_retval = 0; 2884 ssize_t write_retval = 0;
2885 2885
2886 IXJ *j = get_ixj(NUM(file_p->f_dentry->d_inode)); 2886 IXJ *j = get_ixj(NUM(file_p->f_path.dentry->d_inode));
2887 2887
2888 pre_retval = ixj_PreWrite(j, 0L); 2888 pre_retval = ixj_PreWrite(j, 0L);
2889 switch (pre_retval) { 2889 switch (pre_retval) {
@@ -4582,7 +4582,7 @@ static unsigned int ixj_poll(struct file *file_p, poll_table * wait)
4582{ 4582{
4583 unsigned int mask = 0; 4583 unsigned int mask = 0;
4584 4584
4585 IXJ *j = get_ixj(NUM(file_p->f_dentry->d_inode)); 4585 IXJ *j = get_ixj(NUM(file_p->f_path.dentry->d_inode));
4586 4586
4587 poll_wait(file_p, &(j->poll_q), wait); 4587 poll_wait(file_p, &(j->poll_q), wait);
4588 if (j->read_buffer_ready > 0) 4588 if (j->read_buffer_ready > 0)
@@ -6657,7 +6657,7 @@ static int ixj_ioctl(struct inode *inode, struct file *file_p, unsigned int cmd,
6657 6657
6658static int ixj_fasync(int fd, struct file *file_p, int mode) 6658static int ixj_fasync(int fd, struct file *file_p, int mode)
6659{ 6659{
6660 IXJ *j = get_ixj(NUM(file_p->f_dentry->d_inode)); 6660 IXJ *j = get_ixj(NUM(file_p->f_path.dentry->d_inode));
6661 6661
6662 return fasync_helper(fd, file_p, mode, &j->async_queue); 6662 return fasync_helper(fd, file_p, mode, &j->async_queue);
6663} 6663}