Hi,
On 12/3/20 11:30 PM, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@xxxxxxxx>
>
> The only reference to the mlxplat_mlxcpld_psu[] array got removed,
> so there is now a warning from clang:
>
> drivers/platform/x86/mlx-platform.c:322:30: error: variable 'mlxplat_mlxcpld_psu' is not needed and will not be emitted [-Werror,-Wunneeded-internal-declaration]
> static struct i2c_board_info mlxplat_mlxcpld_psu[] = {
>
> Remove the array as well and adapt the ARRAY_SIZE() call
> accordingly.
>
> Fixes: 912b341585e3 ("platform/x86: mlx-platform: Remove PSU EEPROM from MSN274x platform configuration")
> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Thank you for your patch.
Note that there are 4 more cases where the foo1 and foo2 in:
.data = foo1 and .count = ARRAY_SIZE(foo2) are not the same.
There are 2 cases where .count is set to ARRAY_SIZE(mlxplat_mlxcpld_pwr)
instead of to ARRAY_SIZE(mlxplat_mlxcpld_default_pwr_items_data)
and there are 2 cases where .count is set to ARRAY_SIZE(mlxplat_mlxcpld_fan)
instead of to ARRAY_SIZE(mlxplat_mlxcpld_default_fan_items_data)
If one of the MLX people can provide a patch fixing this then that
would be great.
###
I've applied this patch to my review-hans branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans
Note it will show up in my review-hans branch once I've pushed my
local branch there, which might take a while.
Once I've run some tests on this branch the patches there will be
added to the platform-drivers-x86/for-next branch and eventually
will be included in the pdx86 pull-request to Linus for the next
merge-window.
Regards,
Hans
> ---
> drivers/platform/x86/mlx-platform.c | 13 ++-----------
> 1 file changed, 2 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/platform/x86/mlx-platform.c b/drivers/platform/x86/mlx-platform.c
> index 598f44558764..6a634b72bfc2 100644
> --- a/drivers/platform/x86/mlx-platform.c
> +++ b/drivers/platform/x86/mlx-platform.c
> @@ -319,15 +319,6 @@ static struct i2c_mux_reg_platform_data mlxplat_extended_mux_data[] = {
> };
>
> /* Platform hotplug devices */
> -static struct i2c_board_info mlxplat_mlxcpld_psu[] = {
> - {
> - I2C_BOARD_INFO("24c02", 0x51),
> - },
> - {
> - I2C_BOARD_INFO("24c02", 0x50),
> - },
> -};
> -
> static struct i2c_board_info mlxplat_mlxcpld_pwr[] = {
> {
> I2C_BOARD_INFO("dps460", 0x59),
> @@ -456,7 +447,7 @@ static struct mlxreg_core_item mlxplat_mlxcpld_default_items[] = {
> .aggr_mask = MLXPLAT_CPLD_AGGR_PSU_MASK_DEF,
> .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET,
> .mask = MLXPLAT_CPLD_PSU_MASK,
> - .count = ARRAY_SIZE(mlxplat_mlxcpld_psu),
> + .count = ARRAY_SIZE(mlxplat_mlxcpld_default_psu_items_data),
> .inversed = 1,
> .health = false,
> },
> @@ -495,7 +486,7 @@ static struct mlxreg_core_item mlxplat_mlxcpld_comex_items[] = {
> .aggr_mask = MLXPLAT_CPLD_AGGR_MASK_CARRIER,
> .reg = MLXPLAT_CPLD_LPC_REG_PSU_OFFSET,
> .mask = MLXPLAT_CPLD_PSU_MASK,
> - .count = ARRAY_SIZE(mlxplat_mlxcpld_psu),
> + .count = ARRAY_SIZE(mlxplat_mlxcpld_default_psu_items_data),
> .inversed = 1,
> .health = false,
> },
>
