diff options
Diffstat (limited to 'arch/cris/arch-v32/drivers/sync_serial.c')
-rw-r--r-- | arch/cris/arch-v32/drivers/sync_serial.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/cris/arch-v32/drivers/sync_serial.c b/arch/cris/arch-v32/drivers/sync_serial.c index a6a180bc566f..219f704e3221 100644 --- a/arch/cris/arch-v32/drivers/sync_serial.c +++ b/arch/cris/arch-v32/drivers/sync_serial.c | |||
@@ -609,7 +609,7 @@ static int sync_serial_release(struct inode *inode, struct file *file) | |||
609 | 609 | ||
610 | static unsigned int sync_serial_poll(struct file *file, poll_table *wait) | 610 | static unsigned int sync_serial_poll(struct file *file, poll_table *wait) |
611 | { | 611 | { |
612 | int dev = iminor(file->f_path.dentry->d_inode); | 612 | int dev = iminor(file_inode(file)); |
613 | unsigned int mask = 0; | 613 | unsigned int mask = 0; |
614 | sync_port *port; | 614 | sync_port *port; |
615 | DEBUGPOLL( static unsigned int prev_mask = 0; ); | 615 | DEBUGPOLL( static unsigned int prev_mask = 0; ); |
@@ -657,7 +657,7 @@ static int sync_serial_ioctl(struct file *file, | |||
657 | { | 657 | { |
658 | int return_val = 0; | 658 | int return_val = 0; |
659 | int dma_w_size = regk_dma_set_w_size1; | 659 | int dma_w_size = regk_dma_set_w_size1; |
660 | int dev = iminor(file->f_path.dentry->d_inode); | 660 | int dev = iminor(file_inode(file)); |
661 | sync_port *port; | 661 | sync_port *port; |
662 | reg_sser_rw_tr_cfg tr_cfg; | 662 | reg_sser_rw_tr_cfg tr_cfg; |
663 | reg_sser_rw_rec_cfg rec_cfg; | 663 | reg_sser_rw_rec_cfg rec_cfg; |
@@ -979,7 +979,7 @@ static long sync_serial_ioctl(struct file *file, | |||
979 | static ssize_t sync_serial_write(struct file *file, const char *buf, | 979 | static ssize_t sync_serial_write(struct file *file, const char *buf, |
980 | size_t count, loff_t *ppos) | 980 | size_t count, loff_t *ppos) |
981 | { | 981 | { |
982 | int dev = iminor(file->f_path.dentry->d_inode); | 982 | int dev = iminor(file_inode(file)); |
983 | DECLARE_WAITQUEUE(wait, current); | 983 | DECLARE_WAITQUEUE(wait, current); |
984 | struct sync_port *port; | 984 | struct sync_port *port; |
985 | int trunc_count; | 985 | int trunc_count; |
@@ -1102,7 +1102,7 @@ static ssize_t sync_serial_write(struct file *file, const char *buf, | |||
1102 | static ssize_t sync_serial_read(struct file * file, char * buf, | 1102 | static ssize_t sync_serial_read(struct file * file, char * buf, |
1103 | size_t count, loff_t *ppos) | 1103 | size_t count, loff_t *ppos) |
1104 | { | 1104 | { |
1105 | int dev = iminor(file->f_path.dentry->d_inode); | 1105 | int dev = iminor(file_inode(file)); |
1106 | int avail; | 1106 | int avail; |
1107 | sync_port *port; | 1107 | sync_port *port; |
1108 | unsigned char* start; | 1108 | unsigned char* start; |