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 <[email protected]>
---
drivers/i2c/busses/i2c-qup.c | 2 --
1 file changed, 2 deletions(-)
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)
{
--
2.9.0
On 5/30/2018 3:31 PM, Arnd Bergmann wrote:
> 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 <[email protected]>
> ---
> drivers/i2c/busses/i2c-qup.c | 2 --
> 1 file changed, 2 deletions(-)
>
> 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)
> {
>
Yeah this is correct.
Reviewed-by: Austin Christ <[email protected]>
--
Qualcomm Datacenter Technologies as an affiliate of Qualcomm
Technologies, Inc.
Qualcomm Technologies, Inc. is a member of the
Code Aurora Forum, a Linux Foundation Collaborative Project.
On Wed, May 30, 2018 at 11:31:49PM +0200, Arnd Bergmann wrote:
> 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 <[email protected]>
Applied to for-next, thanks!