diff options
| author | Josef Sipek <jsipek@fsl.cs.sunysb.edu> | 2006-12-08 02:37:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 08:28:46 -0800 |
| commit | d1f229744ece0b7aa7ce89ecd1fb598b90305d5b (patch) | |
| tree | 4554cd1f4c6cdab8d60a060d663102e982330787 /drivers/telephony | |
| parent | 4482dfad69d783d1df03ed3952838451a249985e (diff) | |
| download | op-kernel-dev-d1f229744ece0b7aa7ce89ecd1fb598b90305d5b.zip op-kernel-dev-d1f229744ece0b7aa7ce89ecd1fb598b90305d5b.tar.gz | |
[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.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c index 1b601b6..df4cc1f 100644 --- a/drivers/telephony/ixj.c +++ b/drivers/telephony/ixj.c @@ -2747,7 +2747,7 @@ static void alaw2ulaw(unsigned char *buff, unsigned long len) static ssize_t ixj_read(struct file * file_p, char __user *buf, size_t length, loff_t * ppos) { unsigned long i = *ppos; - IXJ * j = get_ixj(NUM(file_p->f_dentry->d_inode)); + IXJ * j = get_ixj(NUM(file_p->f_path.dentry->d_inode)); DECLARE_WAITQUEUE(wait, current); @@ -2804,7 +2804,7 @@ static ssize_t ixj_enhanced_read(struct file * file_p, char __user *buf, size_t { int pre_retval; ssize_t read_retval = 0; - IXJ *j = get_ixj(NUM(file_p->f_dentry->d_inode)); + IXJ *j = get_ixj(NUM(file_p->f_path.dentry->d_inode)); pre_retval = ixj_PreRead(j, 0L); switch (pre_retval) { @@ -2883,7 +2883,7 @@ static ssize_t ixj_enhanced_write(struct file * file_p, const char __user *buf, int pre_retval; ssize_t write_retval = 0; - IXJ *j = get_ixj(NUM(file_p->f_dentry->d_inode)); + IXJ *j = get_ixj(NUM(file_p->f_path.dentry->d_inode)); pre_retval = ixj_PreWrite(j, 0L); switch (pre_retval) { @@ -4582,7 +4582,7 @@ static unsigned int ixj_poll(struct file *file_p, poll_table * wait) { unsigned int mask = 0; - IXJ *j = get_ixj(NUM(file_p->f_dentry->d_inode)); + IXJ *j = get_ixj(NUM(file_p->f_path.dentry->d_inode)); poll_wait(file_p, &(j->poll_q), wait); if (j->read_buffer_ready > 0) @@ -6657,7 +6657,7 @@ static int ixj_ioctl(struct inode *inode, struct file *file_p, unsigned int cmd, static int ixj_fasync(int fd, struct file *file_p, int mode) { - IXJ *j = get_ixj(NUM(file_p->f_dentry->d_inode)); + IXJ *j = get_ixj(NUM(file_p->f_path.dentry->d_inode)); return fasync_helper(fd, file_p, mode, &j->async_queue); } |
