From patchwork Tue Mar 13 11:42:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 131434 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp620339ljb; Tue, 13 Mar 2018 04:43:37 -0700 (PDT) X-Google-Smtp-Source: AG47ELsv2D8WgQPNa1VZKx/DsCPOlsGzLEWwh5bZr85JnE9khA+unYU8Ib78lP3/IBjSqx4i7v5S X-Received: by 2002:a17:902:8a94:: with SMTP id p20-v6mr315695plo.74.1520941417636; Tue, 13 Mar 2018 04:43:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520941417; cv=none; d=google.com; s=arc-20160816; b=k573k1XuQ6XVVAmKdqeN2hoyaYTGRl/2O/olhOGn4hYR85zBbqvXPQ6R6XOvs97q6g NcFvHtAFEelkz9DHgH9bCl87RAGjXOtFyyUp0VJBUIRatKohrV1xUvXdWZUqBAZ4CLcE dxy3wZj1bMoUymC8XYJobxBv+gIqkzettyro4WEEv/1UbDkelfGOrF/CKEkY0cwaISLG nWGCI99GimSF2WJChuqdm8dy2E36iy5+DnX7+Nx9UE6NrSBEepdeQfiQZ+FjNxaK6dR0 KgdnC1MdARxDK4SX4D7PGYEOV22wN90Lz8+hM9bFpiObCTOAEp0DKq9XJKYXqCqlSF2A zHaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=n39dt8BwKXrodgJau0bJyZZ4/EKpPH3eJ2IwepmbK24=; b=gAZP390PVMV1jJq8fgyOPgGrdojrq+0NtEFV/eC5p7Sv8enlMeIWfPSPIztGHLh82N 4f3xCAD2zytSjUbuGwbr/UY+gm+ckpAtEWmAVi/mj7+0lT31ngipXGsCKWpK/6SsJ0jJ seFPMkkSo1xqI8ribOn6rIj0VPs/T6+91SVWoOCRwwPNO+IEQomGhHusPP2bW5L50lM6 6XOLuEEo4WuwUzqMcQXZCi4rEJwR8OfJGDM2S2kb774DzU/jnhAFUCzfBGqG2FJIXXJt Vk4pjHwB8Q19USXBz1DxOZ8UWVbM0TSLH4DJ6yw8l+LlxYRk2QNcQyyImb5S31eO4iev XuCw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l2si10930pgs.276.2018.03.13.04.43.37; Tue, 13 Mar 2018 04:43:37 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752556AbeCMLnd (ORCPT + 28 others); Tue, 13 Mar 2018 07:43:33 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:55459 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752089AbeCMLnb (ORCPT ); Tue, 13 Mar 2018 07:43:31 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0LpNe1-1ePOFh0TH3-00f823; Tue, 13 Mar 2018 12:43:12 +0100 From: Arnd Bergmann To: Darren Hart , Andy Shevchenko Cc: Arnd Bergmann , Mario Limonciello , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] platform/x86: dell-smbios: fix DCDBAS dependency, better Date: Tue, 13 Mar 2018 12:42:57 +0100 Message-Id: <20180313114310.1998450-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:nybxwbCgdeoYPYu5te2q5jHQI7RjJkfqfdp3CNv/kyXCK2RjRYO GZzu9A0q5jTa5xYysPhmNK2gRR2MV8HgzaqU6AmKdHZ0o0RE7t56sAsMx90Vj61P8Ojg5nH FDu6adS3RezNwRzKgKT6VWsrmY66PT2+tZXJJ3Pc7/iF7L83iO+VbWOtJSWZSv7TW5OYHnU C5r9A8bjdktCHYjvoEjCg== X-UI-Out-Filterresults: notjunk:1; V01:K0:vJNa4cm7w7E=:8R8UzOkJcO3V2PeoFM80Lz dUABFE/7qr3Z/33VM+kAaoWdzlk9CZN+3akLmzfmfvuk/Pqah5EFisYQtpw/iVfmEOQ6Op3Tz GUXFtaaMpeE0EUol2oOj7ABeBJYVYTfrHtagX3OyYi3K/p3RN/VvzxSb1iyMy/Kll0h8/GD+X 5gE59TYzHm2WVmoch1xyC4ZUChxyeNQCm6kzXez7dF9YKRrNPYyGDa1d+pYXOqbSNZRwM7nrk Go0liaQ1q1QHMJmmyJV2s3GWUKlpQbO28zabEncOTCqDZWv75NoMx7qHdyHlAPWJVwt+6u0SE DkStD50vF6uxsFvK4BmN5mHpFm6untMGqn2A1vK43GsMJGzFw1uIAgHVZuwFdOyrxC79deZuP LUVcolhWl9+4nwAhamkfkhyYJN3c9cQtAiFo3ZgsCQon6u5mkRfV6fB+pD8J07wjRy7fPyZR1 SGSX3qRnz+ODB7udvDkXg52quKyTbstD+ObSfwFOBv6R97k1beJgWAqDZ/uD2C9PtpqEtW5VE rhsXrQq8uCtlI8dsHV1Tll5GzdHgI9hzF2aLSqeElUJ0h44UBeksdOS5FrkcadJhSDSYw7R3S 0TYk2w2PmS2YdYIPJ/iioUlmTLLKZ5NMNKyBbywVsD1hXeARXqHFEHq60N5CeS+bRA1ZMoZuL PiXhZvqVxKMotqyaTm2LgZwtsMIGGzAthvRAVeVGqvbj39m+xuGJ3P+RjLbfyFBPTNci0QOIN v1IA2h82sDcvL9LQac6xUu6H1+dYDZbGSCbvgg== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The rework of the dell laptop modules caused a link error: drivers/platform/x86/dell-smbios-smm.o: In function `dell_smbios_smm_call': dell-smbios-smm.c:(.text+0x77): undefined reference to `dcdbas_smi_request' We already have a fix for that, but this was only a partial solution, since CONFIG_DELL_LAPTOP and CONFIG_DELL_WMI select CONFIG_DELL_SMBIOS regardless of that dependency. We can either add the same 'DCDBAS || DCDBAS=n' dependency for those two as well, or replace the 'select' with a 'depends on'. The second approach seems cleaner, so I'm picking that here. Fixes: 32d7b19bad96 ("platform/x86: dell-smbios: Resolve dependency error on DCDBAS") Fixes: 25d47027e100 ("platform/x86: dell-smbios: Link all dell-smbios-* modules together") Signed-off-by: Arnd Bergmann --- drivers/platform/x86/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 28905793b5e5..0aec62bb5c61 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -151,7 +151,7 @@ config DELL_LAPTOP depends on ACPI_VIDEO || ACPI_VIDEO = n depends on RFKILL || RFKILL = n depends on SERIO_I8042 - select DELL_SMBIOS + depends on DELL_SMBIOS select POWER_SUPPLY select LEDS_CLASS select NEW_LEDS @@ -165,8 +165,8 @@ config DELL_WMI depends on DMI depends on INPUT depends on ACPI_VIDEO || ACPI_VIDEO = n + depends on DELL_SMBIOS select DELL_WMI_DESCRIPTOR - select DELL_SMBIOS select INPUT_SPARSEKMAP ---help--- Say Y here if you want to support WMI-based hotkeys on Dell laptops.