Merge branches 'pm-core', 'pm-qos', 'pm-domains' and 'pm-opp'

[linux.git] / drivers / infiniband / hw / usnic / usnic_ib_sysfs.c

diff --git a/drivers/infiniband/hw/usnic/usnic_ib_sysfs.c b/drivers/infiniband/hw/usnic/usnic_ib_sysfs.c
index 80ef3f8998c87136a6f941e151138f1440aa031e..04443242e25877ccd65a569500574e89a64aa433 100644 (file)
--- a/drivers/infiniband/hw/usnic/usnic_ib_sysfs.c
+++ b/drivers/infiniband/hw/usnic/usnic_ib_sysfs.c
@@ -80,7 +80,7 @@ usnic_ib_show_config(struct device *device, struct device_attribute *attr,
        left = PAGE_SIZE;
 
        mutex_lock(&us_ibdev->usdev_lock);
-       if (atomic_read(&us_ibdev->vf_cnt.refcount) > 0) {
+       if (kref_read(&us_ibdev->vf_cnt) > 0) {
                char *busname;
 
                /*
@@ -99,7 +99,7 @@ usnic_ib_show_config(struct device *device, struct device_attribute *attr,
                        PCI_FUNC(us_ibdev->pdev->devfn),
                        netdev_name(us_ibdev->netdev),
                        us_ibdev->ufdev->mac,
-                       atomic_read(&us_ibdev->vf_cnt.refcount));
+                       kref_read(&us_ibdev->vf_cnt));
                UPDATE_PTR_LEFT(n, ptr, left);
 
                for (res_type = USNIC_VNIC_RES_TYPE_EOL;
@@ -147,7 +147,7 @@ usnic_ib_show_max_vf(struct device *device, struct device_attribute *attr,
        us_ibdev = container_of(device, struct usnic_ib_dev, ib_dev.dev);
 
        return scnprintf(buf, PAGE_SIZE, "%u\n",
-                       atomic_read(&us_ibdev->vf_cnt.refcount));
+                       kref_read(&us_ibdev->vf_cnt));
 }
 
 static ssize_t