hwmon: constify pointers to hwmon_channel_info

HWmon core receives an array of pointers to hwmon_channel_info and it
does not modify it, thus it can be array of const pointers for safety.
This allows drivers to make them also const.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/Documentation/hwmon/hwmon-kernel-api.rst b/Documentation/hwmon/hwmon-kernel-api.rst
index 5451a6d4c874be9690f362b719e46495462ec214..f00e4a01c240423a14e2de12a1db3674abf570b0 100644 (file)
--- a/Documentation/hwmon/hwmon-kernel-api.rst
+++ b/Documentation/hwmon/hwmon-kernel-api.rst
@@ -133,7 +133,7 @@ The hwmon_chip_info structure looks as follows::
 
        struct hwmon_chip_info {
                const struct hwmon_ops *ops;
-               const struct hwmon_channel_info **info;
+               const struct hwmon_channel_info * const *info;
        };
 
 It contains the following fields:
@@ -229,7 +229,7 @@ register (HWMON_T_MAX) as well as a maximum temperature hysteresis register
                .config = lm75_temp_config,
        };
 
-       static const struct hwmon_channel_info *lm75_info[] = {
+       static const struct hwmon_channel_info * const lm75_info[] = {
                &lm75_chip,
                &lm75_temp,
                NULL
@@ -238,7 +238,7 @@ register (HWMON_T_MAX) as well as a maximum temperature hysteresis register
        The HWMON_CHANNEL_INFO() macro can and should be used when possible.
        With this macro, the above example can be simplified to
 
-       static const struct hwmon_channel_info *lm75_info[] = {
+       static const struct hwmon_channel_info * const lm75_info[] = {
                HWMON_CHANNEL_INFO(chip,
                                HWMON_C_REGISTER_TZ | HWMON_C_UPDATE_INTERVAL),
                HWMON_CHANNEL_INFO(temp,

diff --git a/drivers/accel/habanalabs/common/hwmon.c b/drivers/accel/habanalabs/common/hwmon.c
index 55eb0203817f1761aab75d595a83e6078059105b..8598056216e7517c07662389226cd6674c78a528 100644 (file)
--- a/drivers/accel/habanalabs/common/hwmon.c
+++ b/drivers/accel/habanalabs/common/hwmon.c
@@ -914,7 +914,7 @@ void hl_hwmon_fini(struct hl_device *hdev)
 
 void hl_hwmon_release_resources(struct hl_device *hdev)
 {
-       const struct hwmon_channel_info **channel_info_arr;
+       const struct hwmon_channel_info * const *channel_info_arr;
        int i = 0;
 
        if (!hdev->hl_chip_info->info)

diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c
index d193ed3cb35e5b315f104b04e272862922028e17..c7ebef1990c82e85c0dc4cbcb750b3b1d16f7e08 100644 (file)
--- a/drivers/hwmon/hwmon.c
+++ b/drivers/hwmon/hwmon.c
@@ -174,7 +174,7 @@ static int hwmon_thermal_set_trips(struct thermal_zone_device *tz, int low, int
        struct hwmon_thermal_data *tdata = tz->devdata;
        struct hwmon_device *hwdev = to_hwmon_device(tdata->dev);
        const struct hwmon_chip_info *chip = hwdev->chip;
-       const struct hwmon_channel_info **info = chip->info;
+       const struct hwmon_channel_info * const *info = chip->info;
        unsigned int i;
        int err;
 
@@ -253,7 +253,7 @@ static int hwmon_thermal_register_sensors(struct device *dev)
 {
        struct hwmon_device *hwdev = to_hwmon_device(dev);
        const struct hwmon_chip_info *chip = hwdev->chip;
-       const struct hwmon_channel_info **info = chip->info;
+       const struct hwmon_channel_info * const *info = chip->info;
        void *drvdata = dev_get_drvdata(dev);
        int i;
 

diff --git a/include/linux/hwmon.h b/include/linux/hwmon.h
index c1b62384b6ee71c96e3d8acd59fa4ea3e42732ad..492dd27a5dd87fe7f53d5bb051c0ce1a09555902 100644 (file)
--- a/include/linux/hwmon.h
+++ b/include/linux/hwmon.h
@@ -430,7 +430,7 @@ struct hwmon_channel_info {
  */
 struct hwmon_chip_info {
        const struct hwmon_ops *ops;
-       const struct hwmon_channel_info **info;
+       const struct hwmon_channel_info * const *info;
 };
 
 /* hwmon_device_register() is deprecated */