diff options
author | Josef Sipek <jsipek@fsl.cs.sunysb.edu> | 2006-12-08 05:37:28 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:48 -0500 |
commit | 46cc65a767f458aec4d342b814a661a15dc31be1 (patch) | |
tree | 65aebec551abf971529c1cc36b8315a6182626f1 /drivers/pci | |
parent | 0c5a5566892de5b240c89b9f72eb1c2e861206a0 (diff) |
[PATCH] struct path: convert pci
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 'drivers/pci')
-rw-r--r-- | drivers/pci/proc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c index 99cf33379769..4a6760a3b31f 100644 --- a/drivers/pci/proc.c +++ b/drivers/pci/proc.c | |||
@@ -23,7 +23,7 @@ static loff_t | |||
23 | proc_bus_pci_lseek(struct file *file, loff_t off, int whence) | 23 | proc_bus_pci_lseek(struct file *file, loff_t off, int whence) |
24 | { | 24 | { |
25 | loff_t new = -1; | 25 | loff_t new = -1; |
26 | struct inode *inode = file->f_dentry->d_inode; | 26 | struct inode *inode = file->f_path.dentry->d_inode; |
27 | 27 | ||
28 | mutex_lock(&inode->i_mutex); | 28 | mutex_lock(&inode->i_mutex); |
29 | switch (whence) { | 29 | switch (whence) { |
@@ -48,7 +48,7 @@ proc_bus_pci_lseek(struct file *file, loff_t off, int whence) | |||
48 | static ssize_t | 48 | static ssize_t |
49 | proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos) | 49 | proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos) |
50 | { | 50 | { |
51 | const struct inode *ino = file->f_dentry->d_inode; | 51 | const struct inode *ino = file->f_path.dentry->d_inode; |
52 | const struct proc_dir_entry *dp = PDE(ino); | 52 | const struct proc_dir_entry *dp = PDE(ino); |
53 | struct pci_dev *dev = dp->data; | 53 | struct pci_dev *dev = dp->data; |
54 | unsigned int pos = *ppos; | 54 | unsigned int pos = *ppos; |
@@ -130,7 +130,7 @@ proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *pp | |||
130 | static ssize_t | 130 | static ssize_t |
131 | proc_bus_pci_write(struct file *file, const char __user *buf, size_t nbytes, loff_t *ppos) | 131 | proc_bus_pci_write(struct file *file, const char __user *buf, size_t nbytes, loff_t *ppos) |
132 | { | 132 | { |
133 | const struct inode *ino = file->f_dentry->d_inode; | 133 | const struct inode *ino = file->f_path.dentry->d_inode; |
134 | const struct proc_dir_entry *dp = PDE(ino); | 134 | const struct proc_dir_entry *dp = PDE(ino); |
135 | struct pci_dev *dev = dp->data; | 135 | struct pci_dev *dev = dp->data; |
136 | int pos = *ppos; | 136 | int pos = *ppos; |
@@ -245,7 +245,7 @@ static int proc_bus_pci_ioctl(struct inode *inode, struct file *file, unsigned i | |||
245 | #ifdef HAVE_PCI_MMAP | 245 | #ifdef HAVE_PCI_MMAP |
246 | static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma) | 246 | static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma) |
247 | { | 247 | { |
248 | struct inode *inode = file->f_dentry->d_inode; | 248 | struct inode *inode = file->f_path.dentry->d_inode; |
249 | const struct proc_dir_entry *dp = PDE(inode); | 249 | const struct proc_dir_entry *dp = PDE(inode); |
250 | struct pci_dev *dev = dp->data; | 250 | struct pci_dev *dev = dp->data; |
251 | struct pci_filp_private *fpriv = file->private_data; | 251 | struct pci_filp_private *fpriv = file->private_data; |