From c4da37c04c951f4431264421e80a88f611728c00 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 30 Dec 2020 10:35:33 +0100 Subject: [PATCH] 5.4-stable patches added patches: platform-x86-mlx-platform-remove-an-unused-variable.patch --- ...x-platform-remove-an-unused-variable.patch | 57 +++++++++++++++++++ queue-5.4/series | 1 + 2 files changed, 58 insertions(+) create mode 100644 queue-5.4/platform-x86-mlx-platform-remove-an-unused-variable.patch diff --git a/queue-5.4/platform-x86-mlx-platform-remove-an-unused-variable.patch b/queue-5.4/platform-x86-mlx-platform-remove-an-unused-variable.patch new file mode 100644 index 00000000000..8b8251c8d1b --- /dev/null +++ b/queue-5.4/platform-x86-mlx-platform-remove-an-unused-variable.patch @@ -0,0 +1,57 @@ +From eca6ba20f38cfa2f148d7bd13db7ccd19e88635b Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Thu, 3 Dec 2020 23:30:56 +0100 +Subject: platform/x86: mlx-platform: remove an unused variable + +From: Arnd Bergmann + +commit eca6ba20f38cfa2f148d7bd13db7ccd19e88635b upstream. + +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 +Acked-by: Vadim Pasternak +Link: https://lore.kernel.org/r/20201203223105.1195709-1-arnd@kernel.org +Signed-off-by: Hans de Goede +Cc: Nathan Chancellor +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/platform/x86/mlx-platform.c | 11 +---------- + 1 file changed, 1 insertion(+), 10 deletions(-) + +--- a/drivers/platform/x86/mlx-platform.c ++++ b/drivers/platform/x86/mlx-platform.c +@@ -234,15 +234,6 @@ static struct i2c_mux_reg_platform_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), +@@ -346,7 +337,7 @@ static struct mlxreg_core_item mlxplat_m + .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, + }, diff --git a/queue-5.4/series b/queue-5.4/series index 764bde82c03..83345b23498 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -390,6 +390,7 @@ ubifs-wbuf-don-t-leak-kernel-memory-to-flash.patch jffs2-fix-gc-exit-abnormally.patch jffs2-fix-ignoring-mounting-options-problem-during-remounting.patch jfs-fix-array-index-bounds-check-in-dbadjtree.patch +platform-x86-mlx-platform-remove-an-unused-variable.patch drm-amd-display-fix-memory-leaks-in-s3-resume.patch drm-dp_aux_dev-check-aux_dev-before-use-in-drm_dp_aux_dev_get_by_minor.patch drm-i915-fix-mismatch-between-misplaced-vma-check-and-vma-insert.patch -- 2.47.3