2023-05-11 18:10:20

by Krzysztof Kozlowski

Subject: [RESEND PATCH] drm/i915: constify pointers to hwmon_channel_info

Statically allocated array of pointers to hwmon_channel_info can be made
const for safety.

Acked-by: Jani Nikula <[email protected]>
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
drivers/gpu/drm/i915/i915_hwmon.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_hwmon.c b/drivers/gpu/drm/i915/i915_hwmon.c
index 8e7dccc8d3a0..e99e8c97ef01 100644
--- a/drivers/gpu/drm/i915/i915_hwmon.c
+++ b/drivers/gpu/drm/i915/i915_hwmon.c
@@ -267,7 +267,7 @@ static const struct attribute_group *hwm_groups[] = {
NULL
};

-static const struct hwmon_channel_info *hwm_info[] = {
+static const struct hwmon_channel_info * const hwm_info[] = {
HWMON_CHANNEL_INFO(in, HWMON_I_INPUT),
HWMON_CHANNEL_INFO(power, HWMON_P_MAX | HWMON_P_RATED_MAX | HWMON_P_CRIT),
HWMON_CHANNEL_INFO(energy, HWMON_E_INPUT),
@@ -275,7 +275,7 @@ static const struct hwmon_channel_info *hwm_info[] = {
NULL
};

-static const struct hwmon_channel_info *hwm_gt_info[] = {
+static const struct hwmon_channel_info * const hwm_gt_info[] = {
HWMON_CHANNEL_INFO(energy, HWMON_E_INPUT),
NULL
};
--
2.34.1

2023-05-17 09:40:52

by Jani Nikula

Subject: Re: [RESEND PATCH] drm/i915: constify pointers to hwmon_channel_info

On Thu, 11 May 2023, Krzysztof Kozlowski <[email protected]> wrote:
> Statically allocated array of pointers to hwmon_channel_info can be made
> const for safety.
>
> Acked-by: Jani Nikula <[email protected]>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>

FYI we'll merge this once we've done a backmerge to get the hwmon
changes to our tree.

BR,
Jani.


> ---
> drivers/gpu/drm/i915/i915_hwmon.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_hwmon.c b/drivers/gpu/drm/i915/i915_hwmon.c
> index 8e7dccc8d3a0..e99e8c97ef01 100644
> --- a/drivers/gpu/drm/i915/i915_hwmon.c
> +++ b/drivers/gpu/drm/i915/i915_hwmon.c
> @@ -267,7 +267,7 @@ static const struct attribute_group *hwm_groups[] = {
> NULL
> };
>
> -static const struct hwmon_channel_info *hwm_info[] = {
> +static const struct hwmon_channel_info * const hwm_info[] = {
> HWMON_CHANNEL_INFO(in, HWMON_I_INPUT),
> HWMON_CHANNEL_INFO(power, HWMON_P_MAX | HWMON_P_RATED_MAX | HWMON_P_CRIT),
> HWMON_CHANNEL_INFO(energy, HWMON_E_INPUT),
> @@ -275,7 +275,7 @@ static const struct hwmon_channel_info *hwm_info[] = {
> NULL
> };
>
> -static const struct hwmon_channel_info *hwm_gt_info[] = {
> +static const struct hwmon_channel_info * const hwm_gt_info[] = {
> HWMON_CHANNEL_INFO(energy, HWMON_E_INPUT),
> NULL
> };

--
Jani Nikula, Intel Open Source Graphics Center

2023-05-17 09:43:41

by Krzysztof Kozlowski

Subject: Re: [RESEND PATCH] drm/i915: constify pointers to hwmon_channel_info

On 17/05/2023 11:28, Jani Nikula wrote:
> On Thu, 11 May 2023, Krzysztof Kozlowski <[email protected]> wrote:
>> Statically allocated array of pointers to hwmon_channel_info can be made
>> const for safety.
>>
>> Acked-by: Jani Nikula <[email protected]>
>> Signed-off-by: Krzysztof Kozlowski <[email protected]>
>
> FYI we'll merge this once we've done a backmerge to get the hwmon
> changes to our tree.

There are no dependencies. hwmon changes are already in rc1.

Best regards,
Krzysztof

2023-05-17 09:43:59

by Jani Nikula

Subject: Re: [RESEND PATCH] drm/i915: constify pointers to hwmon_channel_info

On Wed, 17 May 2023, Krzysztof Kozlowski <[email protected]> wrote:
> On 17/05/2023 11:28, Jani Nikula wrote:
>> On Thu, 11 May 2023, Krzysztof Kozlowski <[email protected]> wrote:
>>> Statically allocated array of pointers to hwmon_channel_info can be made
>>> const for safety.
>>>
>>> Acked-by: Jani Nikula <[email protected]>
>>> Signed-off-by: Krzysztof Kozlowski <[email protected]>
>>
>> FYI we'll merge this once we've done a backmerge to get the hwmon
>> changes to our tree.
>
> There are no dependencies. hwmon changes are already in rc1.

That's what I'm saying, drm-intel-next doesn't have rc1. :)

BR,
Jani.

>
> Best regards,
> Krzysztof
>

--
Jani Nikula, Intel Open Source Graphics Center

2023-05-19 00:16:28

by Andi Shyti

Subject: Re: [Intel-gfx] [RESEND PATCH] drm/i915: constify pointers to hwmon_channel_info

Hi Krzysztof,

On Thu, May 11, 2023 at 07:54:46PM +0200, Krzysztof Kozlowski wrote:
> Statically allocated array of pointers to hwmon_channel_info can be made
> const for safety.
>
> Acked-by: Jani Nikula <[email protected]>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>

Reviewed-by: Andi Shyti <[email protected]>

Andi

2023-05-23 10:04:54

by Jani Nikula

Subject: Re: [RESEND PATCH] drm/i915: constify pointers to hwmon_channel_info

On Wed, 17 May 2023, Jani Nikula <[email protected]> wrote:
> On Wed, 17 May 2023, Krzysztof Kozlowski <[email protected]> wrote:
>> On 17/05/2023 11:28, Jani Nikula wrote:
>>> On Thu, 11 May 2023, Krzysztof Kozlowski <[email protected]> wrote:
>>>> Statically allocated array of pointers to hwmon_channel_info can be made
>>>> const for safety.
>>>>
>>>> Acked-by: Jani Nikula <[email protected]>
>>>> Signed-off-by: Krzysztof Kozlowski <[email protected]>
>>>
>>> FYI we'll merge this once we've done a backmerge to get the hwmon
>>> changes to our tree.
>>
>> There are no dependencies. hwmon changes are already in rc1.
>
> That's what I'm saying, drm-intel-next doesn't have rc1. :)

Pushed to drm-intel-next, thanks for the patch.

BR,
Jani.

>
> BR,
> Jani.
>
>>
>> Best regards,
>> Krzysztof
>>

--
Jani Nikula, Intel Open Source Graphics Center

2023-05-25 10:06:28

by Jani Nikula

Subject: Re: [RESEND PATCH] drm/i915: constify pointers to hwmon_channel_info

On Thu, 11 May 2023, Krzysztof Kozlowski <[email protected]> wrote:
> Statically allocated array of pointers to hwmon_channel_info can be made
> const for safety.

Btw if you want to further make things const, the compound literals
defined by HWMON_CHANNEL_INFO() still end up mutable, even if they're
only referenced inline using a const pointer. If possible, would be nice
to add const there too.

BR,
Jani.

>
> Acked-by: Jani Nikula <[email protected]>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> drivers/gpu/drm/i915/i915_hwmon.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_hwmon.c b/drivers/gpu/drm/i915/i915_hwmon.c
> index 8e7dccc8d3a0..e99e8c97ef01 100644
> --- a/drivers/gpu/drm/i915/i915_hwmon.c
> +++ b/drivers/gpu/drm/i915/i915_hwmon.c
> @@ -267,7 +267,7 @@ static const struct attribute_group *hwm_groups[] = {
> NULL
> };
>
> -static const struct hwmon_channel_info *hwm_info[] = {
> +static const struct hwmon_channel_info * const hwm_info[] = {
> HWMON_CHANNEL_INFO(in, HWMON_I_INPUT),
> HWMON_CHANNEL_INFO(power, HWMON_P_MAX | HWMON_P_RATED_MAX | HWMON_P_CRIT),
> HWMON_CHANNEL_INFO(energy, HWMON_E_INPUT),
> @@ -275,7 +275,7 @@ static const struct hwmon_channel_info *hwm_info[] = {
> NULL
> };
>
> -static const struct hwmon_channel_info *hwm_gt_info[] = {
> +static const struct hwmon_channel_info * const hwm_gt_info[] = {
> HWMON_CHANNEL_INFO(energy, HWMON_E_INPUT),
> NULL
> };

--
Jani Nikula, Intel Open Source Graphics Center