diff options
author | Josef Sipek <jsipek@fsl.cs.sunysb.edu> | 2006-12-08 05:36:58 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:44 -0500 |
commit | d817be9ca8766b521f6195f57281284c5ab0ff4c (patch) | |
tree | 73f169272fb3f931e8631086b2e73778dcc28de1 /arch | |
parent | 352d8af748a1bee0935987b811c9fc4693803d99 (diff) |
[PATCH] struct path: convert cris
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 'arch')
-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 e067806b2208..424eb0eb1cd5 100644 --- a/arch/cris/arch-v32/drivers/sync_serial.c +++ b/arch/cris/arch-v32/drivers/sync_serial.c | |||
@@ -504,7 +504,7 @@ static int sync_serial_release(struct inode *inode, struct file *file) | |||
504 | 504 | ||
505 | static unsigned int sync_serial_poll(struct file *file, poll_table *wait) | 505 | static unsigned int sync_serial_poll(struct file *file, poll_table *wait) |
506 | { | 506 | { |
507 | int dev = iminor(file->f_dentry->d_inode); | 507 | int dev = iminor(file->f_path.dentry->d_inode); |
508 | unsigned int mask = 0; | 508 | unsigned int mask = 0; |
509 | sync_port* port; | 509 | sync_port* port; |
510 | DEBUGPOLL( static unsigned int prev_mask = 0; ); | 510 | DEBUGPOLL( static unsigned int prev_mask = 0; ); |
@@ -531,7 +531,7 @@ static int sync_serial_ioctl(struct inode *inode, struct file *file, | |||
531 | unsigned int cmd, unsigned long arg) | 531 | unsigned int cmd, unsigned long arg) |
532 | { | 532 | { |
533 | int return_val = 0; | 533 | int return_val = 0; |
534 | int dev = iminor(file->f_dentry->d_inode); | 534 | int dev = iminor(file->f_path.dentry->d_inode); |
535 | sync_port* port; | 535 | sync_port* port; |
536 | reg_sser_rw_tr_cfg tr_cfg; | 536 | reg_sser_rw_tr_cfg tr_cfg; |
537 | reg_sser_rw_rec_cfg rec_cfg; | 537 | reg_sser_rw_rec_cfg rec_cfg; |
@@ -789,7 +789,7 @@ static int sync_serial_ioctl(struct inode *inode, struct file *file, | |||
789 | static ssize_t sync_serial_write(struct file * file, const char * buf, | 789 | static ssize_t sync_serial_write(struct file * file, const char * buf, |
790 | size_t count, loff_t *ppos) | 790 | size_t count, loff_t *ppos) |
791 | { | 791 | { |
792 | int dev = iminor(file->f_dentry->d_inode); | 792 | int dev = iminor(file->f_path.dentry->d_inode); |
793 | DECLARE_WAITQUEUE(wait, current); | 793 | DECLARE_WAITQUEUE(wait, current); |
794 | sync_port *port; | 794 | sync_port *port; |
795 | unsigned long c, c1; | 795 | unsigned long c, c1; |
@@ -919,7 +919,7 @@ static ssize_t sync_serial_write(struct file * file, const char * buf, | |||
919 | static ssize_t sync_serial_read(struct file * file, char * buf, | 919 | static ssize_t sync_serial_read(struct file * file, char * buf, |
920 | size_t count, loff_t *ppos) | 920 | size_t count, loff_t *ppos) |
921 | { | 921 | { |
922 | int dev = iminor(file->f_dentry->d_inode); | 922 | int dev = iminor(file->f_path.dentry->d_inode); |
923 | int avail; | 923 | int avail; |
924 | sync_port *port; | 924 | sync_port *port; |
925 | unsigned char* start; | 925 | unsigned char* start; |