diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-01-23 17:07:38 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-22 23:31:31 -0500 |
commit | 496ad9aa8ef448058e36ca7a787c61f2e63f0f54 (patch) | |
tree | 8f4abde793cd7db5bb8fde6d27ebcacd0e54379a /drivers/char/ppdev.c | |
parent | 57eccb830f1cc93d4b506ba306d8dfa685e0c88f (diff) |
new helper: file_inode(file)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/char/ppdev.c')
-rw-r--r-- | drivers/char/ppdev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c index 1cd49241e60e..ae0b42b66e55 100644 --- a/drivers/char/ppdev.c +++ b/drivers/char/ppdev.c | |||
@@ -107,7 +107,7 @@ static inline void pp_enable_irq (struct pp_struct *pp) | |||
107 | static ssize_t pp_read (struct file * file, char __user * buf, size_t count, | 107 | static ssize_t pp_read (struct file * file, char __user * buf, size_t count, |
108 | loff_t * ppos) | 108 | loff_t * ppos) |
109 | { | 109 | { |
110 | unsigned int minor = iminor(file->f_path.dentry->d_inode); | 110 | unsigned int minor = iminor(file_inode(file)); |
111 | struct pp_struct *pp = file->private_data; | 111 | struct pp_struct *pp = file->private_data; |
112 | char * kbuffer; | 112 | char * kbuffer; |
113 | ssize_t bytes_read = 0; | 113 | ssize_t bytes_read = 0; |
@@ -189,7 +189,7 @@ static ssize_t pp_read (struct file * file, char __user * buf, size_t count, | |||
189 | static ssize_t pp_write (struct file * file, const char __user * buf, | 189 | static ssize_t pp_write (struct file * file, const char __user * buf, |
190 | size_t count, loff_t * ppos) | 190 | size_t count, loff_t * ppos) |
191 | { | 191 | { |
192 | unsigned int minor = iminor(file->f_path.dentry->d_inode); | 192 | unsigned int minor = iminor(file_inode(file)); |
193 | struct pp_struct *pp = file->private_data; | 193 | struct pp_struct *pp = file->private_data; |
194 | char * kbuffer; | 194 | char * kbuffer; |
195 | ssize_t bytes_written = 0; | 195 | ssize_t bytes_written = 0; |
@@ -324,7 +324,7 @@ static enum ieee1284_phase init_phase (int mode) | |||
324 | 324 | ||
325 | static int pp_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | 325 | static int pp_do_ioctl(struct file *file, unsigned int cmd, unsigned long arg) |
326 | { | 326 | { |
327 | unsigned int minor = iminor(file->f_path.dentry->d_inode); | 327 | unsigned int minor = iminor(file_inode(file)); |
328 | struct pp_struct *pp = file->private_data; | 328 | struct pp_struct *pp = file->private_data; |
329 | struct parport * port; | 329 | struct parport * port; |
330 | void __user *argp = (void __user *)arg; | 330 | void __user *argp = (void __user *)arg; |