Commit 53e39628 authored May 30, 2018 by Arnd Bergmann Committed by Wolfram Sang May 31, 2018

i2c: qup: fix building without CONFIG_ACPI

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: 902a91a0 ("i2c: qup: add probe path for Centriq ACPI devices")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Austin Christ <austinwc@codeaurora.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

parent 535ba904

drivers/i2c/busses/i2c-qup.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -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)
		{

Admin message