]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.19-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 Dec 2020 09:29:08 +0000 (10:29 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 Dec 2020 09:29:08 +0000 (10:29 +0100)
added patches:
platform-x86-mlx-platform-remove-an-unused-variable.patch

queue-4.19/platform-x86-mlx-platform-remove-an-unused-variable.patch [new file with mode: 0644]
queue-4.19/series

diff --git a/queue-4.19/platform-x86-mlx-platform-remove-an-unused-variable.patch b/queue-4.19/platform-x86-mlx-platform-remove-an-unused-variable.patch
new file mode 100644 (file)
index 0000000..767030c
--- /dev/null
@@ -0,0 +1,57 @@
+From eca6ba20f38cfa2f148d7bd13db7ccd19e88635b Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Thu, 3 Dec 2020 23:30:56 +0100
+Subject: platform/x86: mlx-platform: remove an unused variable
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+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 <arnd@arndb.de>
+Acked-by: Vadim Pasternak <vadimp@nvidia.com>
+Link: https://lore.kernel.org/r/20201203223105.1195709-1-arnd@kernel.org
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Cc: Nathan Chancellor <natechancellor@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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
+@@ -212,15 +212,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),
+@@ -324,7 +315,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,
+       },
index 48c5852864fb6d7b28a4fdf5e8143f872af9a2a9..3814a0ccfb221d16f6cb4654561a6e6160e87790 100644 (file)
@@ -341,3 +341,4 @@ xenbus-xenbus_backend-disallow-pending-watch-messages.patch
 libnvdimm-namespace-fix-reaping-of-invalidated-block-window-namespace-labels.patch
 platform-x86-intel-vbtn-allow-switch-events-on-acer-switch-alpha-12.patch
 pci-fix-pci_slot_release-null-pointer-dereference.patch
+platform-x86-mlx-platform-remove-an-unused-variable.patch