aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw/ipath/ipath_fs.c
diff options
context:
space:
mode:
authorJosef Sipek <jsipek@fsl.cs.sunysb.edu>2006-12-08 05:37:10 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:28:46 -0500
commit1cfd6e648b5ea21b0d48bf6f18b129e4576557d5 (patch)
treef38dd0031c3a568087cdca633c86c81ecfa5dce3 /drivers/infiniband/hw/ipath/ipath_fs.c
parent4db61081fac72623eb638f918819046361ff1508 (diff)
[PATCH] struct path: convert infiniband
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/infiniband/hw/ipath/ipath_fs.c')
-rw-r--r--drivers/infiniband/hw/ipath/ipath_fs.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
index d9ff283f725e..79a60f020a21 100644
--- a/drivers/infiniband/hw/ipath/ipath_fs.c
+++ b/drivers/infiniband/hw/ipath/ipath_fs.c
@@ -118,7 +118,7 @@ static ssize_t atomic_counters_read(struct file *file, char __user *buf,
118 u16 i; 118 u16 i;
119 struct ipath_devdata *dd; 119 struct ipath_devdata *dd;
120 120
121 dd = file->f_dentry->d_inode->i_private; 121 dd = file->f_path.dentry->d_inode->i_private;
122 122
123 for (i = 0; i < NUM_COUNTERS; i++) 123 for (i = 0; i < NUM_COUNTERS; i++)
124 counters[i] = ipath_snap_cntr(dd, i); 124 counters[i] = ipath_snap_cntr(dd, i);
@@ -138,7 +138,7 @@ static ssize_t atomic_node_info_read(struct file *file, char __user *buf,
138 struct ipath_devdata *dd; 138 struct ipath_devdata *dd;
139 u64 guid; 139 u64 guid;
140 140
141 dd = file->f_dentry->d_inode->i_private; 141 dd = file->f_path.dentry->d_inode->i_private;
142 142
143 guid = be64_to_cpu(dd->ipath_guid); 143 guid = be64_to_cpu(dd->ipath_guid);
144 144
@@ -177,7 +177,7 @@ static ssize_t atomic_port_info_read(struct file *file, char __user *buf,
177 u32 tmp, tmp2; 177 u32 tmp, tmp2;
178 struct ipath_devdata *dd; 178 struct ipath_devdata *dd;
179 179
180 dd = file->f_dentry->d_inode->i_private; 180 dd = file->f_path.dentry->d_inode->i_private;
181 181
182 /* so we only initialize non-zero fields. */ 182 /* so we only initialize non-zero fields. */
183 memset(portinfo, 0, sizeof portinfo); 183 memset(portinfo, 0, sizeof portinfo);
@@ -324,7 +324,7 @@ static ssize_t flash_read(struct file *file, char __user *buf,
324 goto bail; 324 goto bail;
325 } 325 }
326 326
327 dd = file->f_dentry->d_inode->i_private; 327 dd = file->f_path.dentry->d_inode->i_private;
328 if (ipath_eeprom_read(dd, pos, tmp, count)) { 328 if (ipath_eeprom_read(dd, pos, tmp, count)) {
329 ipath_dev_err(dd, "failed to read from flash\n"); 329 ipath_dev_err(dd, "failed to read from flash\n");
330 ret = -ENXIO; 330 ret = -ENXIO;
@@ -377,7 +377,7 @@ static ssize_t flash_write(struct file *file, const char __user *buf,
377 goto bail_tmp; 377 goto bail_tmp;
378 } 378 }
379 379
380 dd = file->f_dentry->d_inode->i_private; 380 dd = file->f_path.dentry->d_inode->i_private;
381 if (ipath_eeprom_write(dd, pos, tmp, count)) { 381 if (ipath_eeprom_write(dd, pos, tmp, count)) {
382 ret = -ENXIO; 382 ret = -ENXIO;
383 ipath_dev_err(dd, "failed to write to flash\n"); 383 ipath_dev_err(dd, "failed to write to flash\n");