Browse Source

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: 902a91a02bdf ("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>
Arnd Bergmann 7 years ago
parent
commit
53e39628ac
1 changed files with 0 additions and 2 deletions
  1. 0 2
      drivers/i2c/busses/i2c-qup.c

+ 0 - 2
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);
 	clk_disable_unprepare(qup->pclk);
 }
 }
 
 
-#if IS_ENABLED(CONFIG_ACPI)
 static const struct acpi_device_id qup_i2c_acpi_match[] = {
 static const struct acpi_device_id qup_i2c_acpi_match[] = {
 	{ "QCOM8010"},
 	{ "QCOM8010"},
 	{ },
 	{ },
 };
 };
 MODULE_DEVICE_TABLE(acpi, qup_i2c_acpi_match);
 MODULE_DEVICE_TABLE(acpi, qup_i2c_acpi_match);
-#endif
 
 
 static int qup_i2c_probe(struct platform_device *pdev)
 static int qup_i2c_probe(struct platform_device *pdev)
 {
 {