IB/ipath: add calls to new 7220 code and enable in build

[safe/jmp/linux-2.6] / drivers / infiniband / hw / ipath / ipath_fs.c

diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c
index 262c25d..23faba9 100644 (file)
--- a/drivers/infiniband/hw/ipath/ipath_fs.c
+++ b/drivers/infiniband/hw/ipath/ipath_fs.c
@@ -108,21 +108,16 @@ static const struct file_operations atomic_stats_ops = {
        .read = atomic_stats_read,
 };
 
-#define NUM_COUNTERS sizeof(struct infinipath_counters) / sizeof(u64)
-
 static ssize_t atomic_counters_read(struct file *file, char __user *buf,
                                    size_t count, loff_t *ppos)
 {
-       u64 counters[NUM_COUNTERS];
-       u16 i;
+       struct infinipath_counters counters;
        struct ipath_devdata *dd;
 
        dd = file->f_path.dentry->d_inode->i_private;
+       dd->ipath_f_read_counters(dd, &counters);
 
-       for (i = 0; i < NUM_COUNTERS; i++)
-               counters[i] = ipath_snap_cntr(dd, i);
-
-       return simple_read_from_buffer(buf, count, ppos, counters,
+       return simple_read_from_buffer(buf, count, ppos, &counters,
                                       sizeof counters);
 }
 
@@ -243,8 +238,7 @@ static int create_device_files(struct super_block *sb,
 
        snprintf(unit, sizeof unit, "%02d", dd->ipath_unit);
        ret = create_file(unit, S_IFDIR|S_IRUGO|S_IXUGO, sb->s_root, &dir,
-                         (struct file_operations *) &simple_dir_operations,
-                         dd);
+                         &simple_dir_operations, dd);
        if (ret) {
                printk(KERN_ERR "create_file(%s) failed: %d\n", unit, ret);
                goto bail;