| Message ID | 20230407145845.79557-1-krzysztof.kozlowski@linaro.org (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | nvme: host: hwmon: constify pointers to hwmon_channel_info | expand |
Thanks, applied to nvme-6.4 with a trivial whitespace fix.
On Tue, Apr 11, 2023 at 08:09:00AM +0200, Christoph Hellwig wrote: > Thanks, > > applied to nvme-6.4 with a trivial whitespace fix. Actually, I've dropped this again as it causes this warning: drivers/nvme/host/hwmon.c:221:19: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] This looks like we might need a core hwmon change first.
On 11/04/2023 08:10, Christoph Hellwig wrote: > On Tue, Apr 11, 2023 at 08:09:00AM +0200, Christoph Hellwig wrote: >> Thanks, >> >> applied to nvme-6.4 with a trivial whitespace fix. > > Actually, I've dropped this again as it causes this warning: > > drivers/nvme/host/hwmon.c:221:19: warning: initialization discards ‘const’ > qualifier from pointer target type [-Wdiscarded-qualifiers] > > This looks like we might need a core hwmon change first. The dependency was described in the patch. Guenter also provided a stable branch with the dependency: git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-const Best regards, Krzysztof
On Tue, Apr 11, 2023 at 08:11:41AM +0200, Krzysztof Kozlowski wrote: > The dependency was described in the patch. Guenter also provided > a stable branch with the dependency: Ok. See below for the version with the whitespace and Subject fix I'd like to see. With that: Acked-by: Christoph Hellwig <hch@lst.de> --- From 882410442b1bb5730f3eec29d8dc9ccda5e92cdb Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Date: Fri, 7 Apr 2023 16:58:45 +0200 Subject: nvme-hwmon: constify pointers to hwmon_channel_info Statically allocated array of pointed to hwmon_channel_info can be made const for safety. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- drivers/nvme/host/hwmon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nvme/host/hwmon.c b/drivers/nvme/host/hwmon.c index 9e6e56c20ec993..6aa153f3178a60 100644 --- a/drivers/nvme/host/hwmon.c +++ b/drivers/nvme/host/hwmon.c @@ -185,7 +185,7 @@ static umode_t nvme_hwmon_is_visible(const void *_data, return 0; } -static const struct hwmon_channel_info *nvme_hwmon_info[] = { +static const struct hwmon_channel_info *const nvme_hwmon_info[] = { HWMON_CHANNEL_INFO(chip, HWMON_C_REGISTER_TZ), HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MIN |
diff --git a/drivers/nvme/host/hwmon.c b/drivers/nvme/host/hwmon.c index 9e6e56c20ec9..c0181d6abd6e 100644 --- a/drivers/nvme/host/hwmon.c +++ b/drivers/nvme/host/hwmon.c @@ -185,7 +185,7 @@ static umode_t nvme_hwmon_is_visible(const void *_data, return 0; } -static const struct hwmon_channel_info *nvme_hwmon_info[] = { +static const struct hwmon_channel_info * const nvme_hwmon_info[] = { HWMON_CHANNEL_INFO(chip, HWMON_C_REGISTER_TZ), HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_MIN |
Statically allocated array of pointed to hwmon_channel_info can be made const for safety. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- This depends on hwmon core patch: https://lore.kernel.org/all/20230406203103.3011503-2-krzysztof.kozlowski@linaro.org/ Therefore I propose this should also go via hwmon tree. Cc: Jean Delvare <jdelvare@suse.com> Cc: Guenter Roeck <linux@roeck-us.net> Cc: linux-hwmon@vger.kernel.org --- drivers/nvme/host/hwmon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)