vdpa: solidrun: constify pointers to hwmon_channel_info

Message ID 20230407150130.79917-1-krzysztof.kozlowski@linaro.org
State New
Headers
Series vdpa: solidrun: constify pointers to hwmon_channel_info |

Commit Message

Krzysztof Kozlowski April 7, 2023, 3:01 p.m. UTC
  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/vdpa/solidrun/snet_hwmon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Michael S. Tsirkin April 7, 2023, 3:03 p.m. UTC | #1
On Fri, Apr 07, 2023 at 05:01:30PM +0200, Krzysztof Kozlowski wrote:
> Statically allocated array of pointed to hwmon_channel_info can be made
> const for safety.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

sure, merge it as appropriate
Acked-by: Michael S. Tsirkin <mst@redhat.com>

> ---
> 
> 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/vdpa/solidrun/snet_hwmon.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/vdpa/solidrun/snet_hwmon.c b/drivers/vdpa/solidrun/snet_hwmon.c
> index e695e36ff753..65304354b34a 100644
> --- a/drivers/vdpa/solidrun/snet_hwmon.c
> +++ b/drivers/vdpa/solidrun/snet_hwmon.c
> @@ -159,7 +159,7 @@ static const struct hwmon_ops snet_hwmon_ops = {
>  	.read_string = snet_hwmon_read_string
>  };
>  
> -static const struct hwmon_channel_info *snet_hwmon_info[] = {
> +static const struct hwmon_channel_info * const snet_hwmon_info[] = {
>  	HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT | HWMON_T_LABEL,
>  			   HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_LABEL),
>  	HWMON_CHANNEL_INFO(power, HWMON_P_INPUT | HWMON_P_LABEL),
> -- 
> 2.34.1
  
Alvaro Karsz April 7, 2023, 4:36 p.m. UTC | #2
> Statically allocated array of pointed to hwmon_channel_info can be made
> const for safety.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> 

Thanks!

Reviewed-by: Alvaro Karsz <alvaro.karsz@solid-run.com>
  
Guenter Roeck April 7, 2023, 11:08 p.m. UTC | #3
On 4/7/23 08:01, Krzysztof Kozlowski wrote:
> 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.

I am not going to apply patches for 10+ subsystems through the hwmon tree.
This can only result in chaos. The dependent patch is available at

git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-const

or wait until after the next commit window to apply this patch.

Thanks,
Guenter

> 
> Cc: Jean Delvare <jdelvare@suse.com>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Cc: linux-hwmon@vger.kernel.org
> ---
>   drivers/vdpa/solidrun/snet_hwmon.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/vdpa/solidrun/snet_hwmon.c b/drivers/vdpa/solidrun/snet_hwmon.c
> index e695e36ff753..65304354b34a 100644
> --- a/drivers/vdpa/solidrun/snet_hwmon.c
> +++ b/drivers/vdpa/solidrun/snet_hwmon.c
> @@ -159,7 +159,7 @@ static const struct hwmon_ops snet_hwmon_ops = {
>   	.read_string = snet_hwmon_read_string
>   };
>   
> -static const struct hwmon_channel_info *snet_hwmon_info[] = {
> +static const struct hwmon_channel_info * const snet_hwmon_info[] = {
>   	HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT | HWMON_T_LABEL,
>   			   HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_LABEL),
>   	HWMON_CHANNEL_INFO(power, HWMON_P_INPUT | HWMON_P_LABEL),
  
Michael S. Tsirkin April 10, 2023, 9:56 a.m. UTC | #4
On Fri, Apr 07, 2023 at 04:08:30PM -0700, Guenter Roeck wrote:
> On 4/7/23 08:01, Krzysztof Kozlowski wrote:
> > 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.
> 
> I am not going to apply patches for 10+ subsystems through the hwmon tree.
> This can only result in chaos. The dependent patch is available at
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-const

Doesn't it cause build errors or warnings there?

> or wait until after the next commit window to apply this patch.
> 
> Thanks,
> Guenter
> 
> > 
> > Cc: Jean Delvare <jdelvare@suse.com>
> > Cc: Guenter Roeck <linux@roeck-us.net>
> > Cc: linux-hwmon@vger.kernel.org
> > ---
> >   drivers/vdpa/solidrun/snet_hwmon.c | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/drivers/vdpa/solidrun/snet_hwmon.c b/drivers/vdpa/solidrun/snet_hwmon.c
> > index e695e36ff753..65304354b34a 100644
> > --- a/drivers/vdpa/solidrun/snet_hwmon.c
> > +++ b/drivers/vdpa/solidrun/snet_hwmon.c
> > @@ -159,7 +159,7 @@ static const struct hwmon_ops snet_hwmon_ops = {
> >   	.read_string = snet_hwmon_read_string
> >   };
> > -static const struct hwmon_channel_info *snet_hwmon_info[] = {
> > +static const struct hwmon_channel_info * const snet_hwmon_info[] = {
> >   	HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT | HWMON_T_LABEL,
> >   			   HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_LABEL),
> >   	HWMON_CHANNEL_INFO(power, HWMON_P_INPUT | HWMON_P_LABEL),
  
Guenter Roeck April 10, 2023, 2:03 p.m. UTC | #5
On 4/10/23 02:56, Michael S. Tsirkin wrote:
> On Fri, Apr 07, 2023 at 04:08:30PM -0700, Guenter Roeck wrote:
>> On 4/7/23 08:01, Krzysztof Kozlowski wrote:
>>> 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.
>>
>> I am not going to apply patches for 10+ subsystems through the hwmon tree.
>> This can only result in chaos. The dependent patch is available at
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-const
> 
> Doesn't it cause build errors or warnings there?
> 

Are you saying that "hwmon: constify pointers to hwmon_channel_info" applied on its own
on top of v6.3-rc5 (as done in above branch) causes build errors or warnings ?
I have not seen any such reports, and I don't immediately see why that would be
the case. Please elaborate.

Guenter

>> or wait until after the next commit window to apply this patch.
>>
>> Thanks,
>> Guenter
>>
>>>
>>> Cc: Jean Delvare <jdelvare@suse.com>
>>> Cc: Guenter Roeck <linux@roeck-us.net>
>>> Cc: linux-hwmon@vger.kernel.org
>>> ---
>>>    drivers/vdpa/solidrun/snet_hwmon.c | 2 +-
>>>    1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/vdpa/solidrun/snet_hwmon.c b/drivers/vdpa/solidrun/snet_hwmon.c
>>> index e695e36ff753..65304354b34a 100644
>>> --- a/drivers/vdpa/solidrun/snet_hwmon.c
>>> +++ b/drivers/vdpa/solidrun/snet_hwmon.c
>>> @@ -159,7 +159,7 @@ static const struct hwmon_ops snet_hwmon_ops = {
>>>    	.read_string = snet_hwmon_read_string
>>>    };
>>> -static const struct hwmon_channel_info *snet_hwmon_info[] = {
>>> +static const struct hwmon_channel_info * const snet_hwmon_info[] = {
>>>    	HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT | HWMON_T_LABEL,
>>>    			   HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_LABEL),
>>>    	HWMON_CHANNEL_INFO(power, HWMON_P_INPUT | HWMON_P_LABEL),
>
  
Krzysztof Kozlowski April 10, 2023, 4:48 p.m. UTC | #6
On 10/04/2023 16:03, Guenter Roeck wrote:
> On 4/10/23 02:56, Michael S. Tsirkin wrote:
>> On Fri, Apr 07, 2023 at 04:08:30PM -0700, Guenter Roeck wrote:
>>> On 4/7/23 08:01, Krzysztof Kozlowski wrote:
>>>> 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.
>>>
>>> I am not going to apply patches for 10+ subsystems through the hwmon tree.
>>> This can only result in chaos. The dependent patch is available at
>>>
>>> git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-const
>>
>> Doesn't it cause build errors or warnings there?
>>
> 
> Are you saying that "hwmon: constify pointers to hwmon_channel_info" applied on its own
> on top of v6.3-rc5 (as done in above branch) causes build errors or warnings ?
> I have not seen any such reports, and I don't immediately see why that would be
> the case. Please elaborate.

My tree and patches are extensively tested by kbuild and there was no
warning reported (when the above patch is applied with above dependency).

Best regards,
Krzysztof
  
Michael S. Tsirkin April 10, 2023, 7:14 p.m. UTC | #7
On Mon, Apr 10, 2023 at 06:48:12PM +0200, Krzysztof Kozlowski wrote:
> On 10/04/2023 16:03, Guenter Roeck wrote:
> > On 4/10/23 02:56, Michael S. Tsirkin wrote:
> >> On Fri, Apr 07, 2023 at 04:08:30PM -0700, Guenter Roeck wrote:
> >>> On 4/7/23 08:01, Krzysztof Kozlowski wrote:
> >>>> 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.
> >>>
> >>> I am not going to apply patches for 10+ subsystems through the hwmon tree.
> >>> This can only result in chaos. The dependent patch is available at
> >>>
> >>> git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-const
> >>
> >> Doesn't it cause build errors or warnings there?
> >>
> > 
> > Are you saying that "hwmon: constify pointers to hwmon_channel_info" applied on its own
> > on top of v6.3-rc5 (as done in above branch) causes build errors or warnings ?
> > I have not seen any such reports, and I don't immediately see why that would be
> > the case. Please elaborate.
> 
> My tree and patches are extensively tested by kbuild and there was no
> warning reported (when the above patch is applied with above dependency).
> 
> Best regards,
> Krzysztof

I don't know, I assumed the vdpa patch fixes build. If not,
I think we can just wait with the vdpa patch until after
the hwmon one is upstream.

Thanks!
  
Michael S. Tsirkin April 10, 2023, 7:16 p.m. UTC | #8
On Mon, Apr 10, 2023 at 07:03:01AM -0700, Guenter Roeck wrote:
> On 4/10/23 02:56, Michael S. Tsirkin wrote:
> > On Fri, Apr 07, 2023 at 04:08:30PM -0700, Guenter Roeck wrote:
> > > On 4/7/23 08:01, Krzysztof Kozlowski wrote:
> > > > 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.
> > > 
> > > I am not going to apply patches for 10+ subsystems through the hwmon tree.
> > > This can only result in chaos. The dependent patch is available at
> > > 
> > > git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-const
> > 
> > Doesn't it cause build errors or warnings there?
> > 
> 
> Are you saying that "hwmon: constify pointers to hwmon_channel_info" applied on its own
> on top of v6.3-rc5 (as done in above branch) causes build errors or warnings ?
> I have not seen any such reports, and I don't immediately see why that would be
> the case. Please elaborate.
> 
> Guenter


I'm not saying that, I just assumed the vdpa patch fixes build.
If build is ok we can just wait for hwmon patch to get upstream. No
rush.

> > > or wait until after the next commit window to apply this patch.
> > > 
> > > Thanks,
> > > Guenter
> > > 
> > > > 
> > > > Cc: Jean Delvare <jdelvare@suse.com>
> > > > Cc: Guenter Roeck <linux@roeck-us.net>
> > > > Cc: linux-hwmon@vger.kernel.org
> > > > ---
> > > >    drivers/vdpa/solidrun/snet_hwmon.c | 2 +-
> > > >    1 file changed, 1 insertion(+), 1 deletion(-)
> > > > 
> > > > diff --git a/drivers/vdpa/solidrun/snet_hwmon.c b/drivers/vdpa/solidrun/snet_hwmon.c
> > > > index e695e36ff753..65304354b34a 100644
> > > > --- a/drivers/vdpa/solidrun/snet_hwmon.c
> > > > +++ b/drivers/vdpa/solidrun/snet_hwmon.c
> > > > @@ -159,7 +159,7 @@ static const struct hwmon_ops snet_hwmon_ops = {
> > > >    	.read_string = snet_hwmon_read_string
> > > >    };
> > > > -static const struct hwmon_channel_info *snet_hwmon_info[] = {
> > > > +static const struct hwmon_channel_info * const snet_hwmon_info[] = {
> > > >    	HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT | HWMON_T_LABEL,
> > > >    			   HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_LABEL),
> > > >    	HWMON_CHANNEL_INFO(power, HWMON_P_INPUT | HWMON_P_LABEL),
> >
  

Patch

diff --git a/drivers/vdpa/solidrun/snet_hwmon.c b/drivers/vdpa/solidrun/snet_hwmon.c
index e695e36ff753..65304354b34a 100644
--- a/drivers/vdpa/solidrun/snet_hwmon.c
+++ b/drivers/vdpa/solidrun/snet_hwmon.c
@@ -159,7 +159,7 @@  static const struct hwmon_ops snet_hwmon_ops = {
 	.read_string = snet_hwmon_read_string
 };
 
-static const struct hwmon_channel_info *snet_hwmon_info[] = {
+static const struct hwmon_channel_info * const snet_hwmon_info[] = {
 	HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT | HWMON_T_MAX | HWMON_T_CRIT | HWMON_T_LABEL,
 			   HWMON_T_INPUT | HWMON_T_CRIT | HWMON_T_LABEL),
 	HWMON_CHANNEL_INFO(power, HWMON_P_INPUT | HWMON_P_LABEL),