Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1f22974 authored by Josef Sipek's avatar Josef Sipek Committed by Linus Torvalds
Browse files

[PATCH] struct path: convert ixj 



Signed-off-by: default avatarJosef Sipek <jsipek@fsl.cs.sunysb.edu>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4482dfad

drivers/telephony/ixj.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -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);

}

}