Commit d817be9c authored by Josef Sipek's avatar Josef Sipek Committed by Linus Torvalds

[PATCH] struct path: convert cris

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 352d8af7
...@@ -504,7 +504,7 @@ static int sync_serial_release(struct inode *inode, struct file *file) ...@@ -504,7 +504,7 @@ static int sync_serial_release(struct inode *inode, struct file *file)
static unsigned int sync_serial_poll(struct file *file, poll_table *wait) static unsigned int sync_serial_poll(struct file *file, poll_table *wait)
{ {
int dev = iminor(file->f_dentry->d_inode); int dev = iminor(file->f_path.dentry->d_inode);
unsigned int mask = 0; unsigned int mask = 0;
sync_port* port; sync_port* port;
DEBUGPOLL( static unsigned int prev_mask = 0; ); DEBUGPOLL( static unsigned int prev_mask = 0; );
...@@ -531,7 +531,7 @@ static int sync_serial_ioctl(struct inode *inode, struct file *file, ...@@ -531,7 +531,7 @@ static int sync_serial_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg) unsigned int cmd, unsigned long arg)
{ {
int return_val = 0; int return_val = 0;
int dev = iminor(file->f_dentry->d_inode); int dev = iminor(file->f_path.dentry->d_inode);
sync_port* port; sync_port* port;
reg_sser_rw_tr_cfg tr_cfg; reg_sser_rw_tr_cfg tr_cfg;
reg_sser_rw_rec_cfg rec_cfg; reg_sser_rw_rec_cfg rec_cfg;
...@@ -789,7 +789,7 @@ static int sync_serial_ioctl(struct inode *inode, struct file *file, ...@@ -789,7 +789,7 @@ static int sync_serial_ioctl(struct inode *inode, struct file *file,
static ssize_t sync_serial_write(struct file * file, const char * buf, static ssize_t sync_serial_write(struct file * file, const char * buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
int dev = iminor(file->f_dentry->d_inode); int dev = iminor(file->f_path.dentry->d_inode);
DECLARE_WAITQUEUE(wait, current); DECLARE_WAITQUEUE(wait, current);
sync_port *port; sync_port *port;
unsigned long c, c1; unsigned long c, c1;
...@@ -919,7 +919,7 @@ static ssize_t sync_serial_write(struct file * file, const char * buf, ...@@ -919,7 +919,7 @@ static ssize_t sync_serial_write(struct file * file, const char * buf,
static ssize_t sync_serial_read(struct file * file, char * buf, static ssize_t sync_serial_read(struct file * file, char * buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
int dev = iminor(file->f_dentry->d_inode); int dev = iminor(file->f_path.dentry->d_inode);
int avail; int avail;
sync_port *port; sync_port *port;
unsigned char* start; unsigned char* start;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment