Merge tag 'driver-core-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / hwmon / ibmpex.c

diff --git a/drivers/hwmon/ibmpex.c b/drivers/hwmon/ibmpex.c
index db066b3689187d810c1734ecedfbbbcbe7516305..228c5f6c6f383688752caa7dc6a8a52b20261d50 100644 (file)
--- a/drivers/hwmon/ibmpex.c
+++ b/drivers/hwmon/ibmpex.c
@@ -256,12 +256,7 @@ static struct ibmpex_bmc_data *get_bmc_data(int iface)
        return NULL;
 }
 
-static ssize_t name_show(struct device *dev, struct device_attribute *devattr,
-                        char *buf)
-{
-       return sprintf(buf, "%s\n", DRVNAME);
-}
-static SENSOR_DEVICE_ATTR_RO(name, name, 0);
+static DEVICE_STRING_ATTR_RO(name, 0444, DRVNAME);
 
 static ssize_t ibmpex_show_sensor(struct device *dev,
                                  struct device_attribute *devattr,
@@ -415,8 +410,7 @@ static int ibmpex_find_sensors(struct ibmpex_bmc_data *data)
        if (err)
                goto exit_remove;
 
-       err = device_create_file(data->bmc_device,
-                       &sensor_dev_attr_name.dev_attr);
+       err = device_create_file(data->bmc_device, &dev_attr_name.attr);
        if (err)
                goto exit_remove;
 
@@ -425,7 +419,7 @@ static int ibmpex_find_sensors(struct ibmpex_bmc_data *data)
 exit_remove:
        device_remove_file(data->bmc_device,
                           &sensor_dev_attr_reset_high_low.dev_attr);
-       device_remove_file(data->bmc_device, &sensor_dev_attr_name.dev_attr);
+       device_remove_file(data->bmc_device, &dev_attr_name.attr);
        for (i = 0; i < data->num_sensors; i++)
                for (j = 0; j < PEX_NUM_SENSOR_FUNCS; j++) {
                        if (!data->sensors[i].attr[j].dev_attr.attr.name)
@@ -516,7 +510,7 @@ static void ibmpex_bmc_delete(struct ibmpex_bmc_data *data)
 
        device_remove_file(data->bmc_device,
                           &sensor_dev_attr_reset_high_low.dev_attr);
-       device_remove_file(data->bmc_device, &sensor_dev_attr_name.dev_attr);
+       device_remove_file(data->bmc_device, &dev_attr_name.attr);
        for (i = 0; i < data->num_sensors; i++)
                for (j = 0; j < PEX_NUM_SENSOR_FUNCS; j++) {
                        if (!data->sensors[i].attr[j].dev_attr.attr.name)