Merge tag 'nvme-5.13-2021-05-05' of git://git.infradead.org/nvme into block-5.13

[linux-2.6-microblaze.git] / drivers / hwmon / max16065.c

diff --git a/drivers/hwmon/max16065.c b/drivers/hwmon/max16065.c
index a26226e..ae3a6a7 100644 (file)
--- a/drivers/hwmon/max16065.c
+++ b/drivers/hwmon/max16065.c
@@ -187,7 +187,7 @@ static ssize_t max16065_alarm_show(struct device *dev,
                i2c_smbus_write_byte_data(data->client,
                                          MAX16065_FAULT(attr2->nr), val);
 
-       return snprintf(buf, PAGE_SIZE, "%d\n", !!val);
+       return sysfs_emit(buf, "%d\n", !!val);
 }
 
 static ssize_t max16065_input_show(struct device *dev,
@@ -200,8 +200,8 @@ static ssize_t max16065_input_show(struct device *dev,
        if (unlikely(adc < 0))
                return adc;
 
-       return snprintf(buf, PAGE_SIZE, "%d\n",
-                       ADC_TO_MV(adc, data->range[attr->index]));
+       return sysfs_emit(buf, "%d\n",
+                         ADC_TO_MV(adc, data->range[attr->index]));
 }
 
 static ssize_t max16065_current_show(struct device *dev,
@@ -212,8 +212,8 @@ static ssize_t max16065_current_show(struct device *dev,
        if (unlikely(data->curr_sense < 0))
                return data->curr_sense;
 
-       return snprintf(buf, PAGE_SIZE, "%d\n",
-                       ADC_TO_CURR(data->curr_sense, data->curr_gain));
+       return sysfs_emit(buf, "%d\n",
+                         ADC_TO_CURR(data->curr_sense, data->curr_gain));
 }
 
 static ssize_t max16065_limit_store(struct device *dev,
@@ -249,8 +249,8 @@ static ssize_t max16065_limit_show(struct device *dev,
        struct sensor_device_attribute_2 *attr2 = to_sensor_dev_attr_2(da);
        struct max16065_data *data = dev_get_drvdata(dev);
 
-       return snprintf(buf, PAGE_SIZE, "%d\n",
-                       data->limit[attr2->nr][attr2->index]);
+       return sysfs_emit(buf, "%d\n",
+                         data->limit[attr2->nr][attr2->index]);
 }
 
 /* Construct a sensor_device_attribute structure for each register */
@@ -454,7 +454,7 @@ static struct attribute *max16065_max_attributes[] = {
 static umode_t max16065_basic_is_visible(struct kobject *kobj,
                                         struct attribute *a, int n)
 {
-       struct device *dev = container_of(kobj, struct device, kobj);
+       struct device *dev = kobj_to_dev(kobj);
        struct max16065_data *data = dev_get_drvdata(dev);
        int index = n / 4;
 
@@ -466,7 +466,7 @@ static umode_t max16065_basic_is_visible(struct kobject *kobj,
 static umode_t max16065_secondary_is_visible(struct kobject *kobj,
                                             struct attribute *a, int index)
 {
-       struct device *dev = container_of(kobj, struct device, kobj);
+       struct device *dev = kobj_to_dev(kobj);
        struct max16065_data *data = dev_get_drvdata(dev);
 
        if (index >= data->num_adc)