From patchwork Wed May 30 21:31:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 137295 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp5819794lji; Wed, 30 May 2018 14:32:16 -0700 (PDT) X-Google-Smtp-Source: ADUXVKI5LTJBdzdWRJLLkp0yu9XEcvdHJOuZ3xuLXOqxn2LoW4g/xFpORTjTX2tuu2YYYNMstFRM X-Received: by 2002:a17:902:323:: with SMTP id 32-v6mr4474606pld.312.1527715936186; Wed, 30 May 2018 14:32:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527715936; cv=none; d=google.com; s=arc-20160816; b=xu79G0N0r4HcF50oCX0wpcGBpR1Hck27N7mQnJdzz8RsxaaXQK1muby+bJCHG2OEUS siwpSVaheu9M8vUPfqUDqCnCpBogPD5V/sywf1oa6Z+jlcfT1ffKEXX3ReH9Phx4nR1X ToV5CjmyMe4miu+lbkNhcSeMLKr8Gaxk7K+4AZZFG+FhHfo5insrRXkJV0o+m9oXvLRA Bdr2IbsGADRiXVr4FniUOx4KuXxxy0yLpWwhTui79UJV7XeimcjQiLHU5/mkZi5cfUcv rktsmdehLD12atYQVXJ3C5HM0D50IAUM606JqvGeX5yeYONJuhNwtIa/DC3Udm2Ikzds 0vBg== 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=+xoDgRl7s4vvesCcjnbvxRxv8/I8ivsMOFZzfBfk6eI=; b=QbIN51XojqalLNfyv6SeykJaJQod20vTOdXw48lDejI53/cf1DCD4uHOCRloxsghFO 5kcbUdrHxBOAfL3kMtWcmVDdLsuyzzbcSayuxsEt3sSv4fFpfC05FGnnEukok2nDm9Ps hRclyr9d3x5l4iDSbtBsKQJRhy0VJUSp/Zd9hjweVkfWCTTNm6vWoTaUu1IbwtF6kO/g iuwygnrzaq3qQxfJ40PZQ9joXerivtWvDxrW98PUX63thFEVSkEzhrG3wOH6IIUokEsS kPBR9bLCZty+5soaFWc8MqM9s1+mp4JLqDOzfO//cOHVZDo+WG/5VKwtn5woRu9tD+v1 SZWQ== 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 33-v6si35173701plq.348.2018.05.30.14.32.15; Wed, 30 May 2018 14:32:16 -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 S932567AbeE3VcO (ORCPT + 30 others); Wed, 30 May 2018 17:32:14 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:56855 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932222AbeE3VcJ (ORCPT ); Wed, 30 May 2018 17:32:09 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0M1eYM-1gCO0O313a-00tgbl; Wed, 30 May 2018 23:32:02 +0200 From: Arnd Bergmann To: Wolfram Sang Cc: Arnd Bergmann , Andy Gross , David Brown , Abhishek Sahu , Austin Christ , Sricharan R , Bhumika Goyal , Peter Rosin , linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] i2c: qup: fix building without CONFIG_ACPI Date: Wed, 30 May 2018 23:31:49 +0200 Message-Id: <20180530213201.550467-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K1:RW96WaseYu6XKt5P3gGe1ACuRLJuN4SD16A+MITk4+lEKS0q/zg smyBRbiu+YR4rEOYvClTRRGQTqwB35sdVHl29s2IUSAw2vhnifyWEPZwlEh85PJ8qJL4tOE aAvjtYsMHYOvufX4WTjcnsyPvfcmb0AoEtqTwGpZdhr5NXTO0mHzEk3FatmWoWQOZchIhng uKcgOnnUZPXzELBY4jB6Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:rUIwTPR81oc=:sCgo+rQLDoJ76tN79+MUGf cE3Gjzbyz9K5LO4W1Pl6qEEVEg7n1fY56upwvC9aJy+nN9wOgEoZCQeVm6h12avzTpeLXSNoX HwZB4xEJoIf3EWMGxAJCow9hkiqwPEyYh3dkkie5tYlndBsSt/+snlUJsdWsiJ8hELhydbVTm y2ZW2b7uR0Ov5DCAHrZSsphP71UG5CL8bccZrPn0IZvawCzkmKnWFAAzpRnxeXUvHac/wcc/H Svqbns2yIhbRyVkHVrYijiUonEFGwz8THsg//e1QfuPvpD5k2HDXLrBDkuBuym6QQDRlmnNNo LHz1HW3h0yEENwkmZNOmwcMvDJFnrqHouIH6hufnDshWOR39BX+2L0tMYY4d8sfxUgTMlh+Qw ALuYlNe/yxa5Dnfg/Iv66PRV7sQhQZZx9yg9S+StXS+BwJg3AqroiJOcRjANnO+LevK1UhprS 061djTQfFF2vM0EPsg48phWL7dkITqoyfuaTS/SMQJP1wQfcfuzyttfMtY889uZ0ewwFlXpxe 2LddtWLIGzOtkSA4nv+BaexLERdG+s6/XG4dUv28kW+mYj+hLq4+iikyEld0ed9P2mklblNqI LHg7ZI/rgpRCzM6SNUfhHi2axnZWOlItUo8XbdIS2nhv7LEwkjY0NETaCpjzjWx6Sb0AWTuzt bWLzcM87Bmg+kMWY5TSwAsx7RFHqMUU1oTQfmB4cZoATRZe6aRoLD9t70YxU5WaaOZXA= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The added Centriq support broke compilation with CONFIG_ACPI disabled: drivers/i2c/busses/i2c-qup.c: In function 'qup_i2c_probe': drivers/i2c/busses/i2c-qup.c:1707:25: error: 'qup_i2c_acpi_match' undeclared (first use in this function); did you mean 'qup_i2c_recv_data'? This fixes it by removing the extraneous #ifdef. All ACPI specific code will be dropped implicitly when that option is disabled, but the compiler first needs to see it. Fixes: 902a91a02bdf ("i2c: qup: add probe path for Centriq ACPI devices") Signed-off-by: Arnd Bergmann --- drivers/i2c/busses/i2c-qup.c | 2 -- 1 file changed, 2 deletions(-) -- 2.9.0 diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c index 4f793b5d0c3b..9cfcc0473227 100644 --- a/drivers/i2c/busses/i2c-qup.c +++ b/drivers/i2c/busses/i2c-qup.c @@ -1657,13 +1657,11 @@ static void qup_i2c_disable_clocks(struct qup_i2c_dev *qup) clk_disable_unprepare(qup->pclk); } -#if IS_ENABLED(CONFIG_ACPI) static const struct acpi_device_id qup_i2c_acpi_match[] = { { "QCOM8010"}, { }, }; MODULE_DEVICE_TABLE(acpi, qup_i2c_acpi_match); -#endif static int qup_i2c_probe(struct platform_device *pdev) {