Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] struct path: convert ixj

Browse source 
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>
This commit is contained in:
Josef Sipek 2006-12-08 02:37:14 -08:00 committed by Linus Torvalds
parent 4482dfad69
commit d1f229744e
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/telephony/ixj.c
View file

@ -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) static ssize_t ixj_read(struct file * file_p, char __user *buf, size_t length, loff_t * ppos)
{ {
unsigned long i = *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); 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; int pre_retval;
ssize_t read_retval = 0; 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); pre_retval = ixj_PreRead(j, 0L);
switch (pre_retval) { switch (pre_retval) {
@ -2883,7 +2883,7 @@ static ssize_t ixj_enhanced_write(struct file * file_p, const char __user *buf,
int pre_retval; int pre_retval;
ssize_t write_retval = 0; 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); pre_retval = ixj_PreWrite(j, 0L);
switch (pre_retval) { switch (pre_retval) {
@ -4582,7 +4582,7 @@ static unsigned int ixj_poll(struct file *file_p, poll_table * wait)
{ {
unsigned int mask = 0; 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); poll_wait(file_p, &(j->poll_q), wait);
if (j->read_buffer_ready > 0) 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) 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); return fasync_helper(fd, file_p, mode, &j->async_queue);
} }