Input: goodix - Fix compilation when ACPI support is disabled
Subsystems (3)
PATCH v2 1/1 Input: goodix - Fix compilation when ACPI support is disabled
acpi_evaluate_object() and acpi_execute_simple_method() are not part of the group of ACPI related functions which get stubbed by include/linux/acpi.h when ACPI support is disabled, so the IRQ_PIN_ACCESS_ACPI_METHOD handling code must be disabled through an #ifdef when ACPI support is not enabled.
For consistency also #ifdef out the IRQ_PIN_ACCESS_ACPI_GPIO code and use the same #if condition as which is used to replace goodix_add_acpi_gpio_mappings with a stub.
---
Changes in v2:
- Introduce ACPI_GPIO_SUPPORT helper define
- Use __maybe_unused for variables which will be unused when ACPI_GPIO_SUPPORT is not set
--- drivers/input/touchscreen/goodix.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-)
drivers/input/touchscreen/goodix.c +19 -5
@@ -63,13 +63,20 @@#define MAX_CONTACTS_LOC 5#define TRIGGER_LOC 6 +/* Our special handling for GPIO accesses through ACPI is x86 specific */ +#if definedCONFIG_X86 && definedCONFIG_ACPI +#define ACPI_GPIO_SUPPORT +#endif +struct goodix_ts_data ;enum goodix_irq_pin_access_method {IRQ_PIN_ACCESS_NONE ,IRQ_PIN_ACCESS_GPIO , +#ifdef ACPI_GPIO_SUPPORT IRQ_PIN_ACCESS_ACPI_GPIO ,IRQ_PIN_ACCESS_ACPI_METHOD , +#endif };struct goodix_chip_data {
@@ -572,8 +579,8 @@ static int goodix_send_cfg(struct goodix_ts_data *ts, const u8 *cfg, int len)static int goodix_irq_direction_output (struct goodix_ts_data *ts,int value) { -struct device *dev = &ts->client->dev; -acpi_status status; +struct device *dev__maybe_unused = &ts->client->dev; +acpi_status status__maybe_unused ;switch (ts->irq_pin_access_method) {case IRQ_PIN_ACCESS_NONE :
@@ -583,6 +590,7 @@ static int goodix_irq_direction_output(struct goodix_ts_data *ts,return -EINVAL ;case IRQ_PIN_ACCESS_GPIO :return gpiod_direction_output (ts->gpiod_int, value); +#ifdef ACPI_GPIO_SUPPORT case IRQ_PIN_ACCESS_ACPI_GPIO :/* * The IRQ pin triggers on a falling edge, so its gets marked
@@ -593,6 +601,7 @@ static int goodix_irq_direction_output(struct goodix_ts_data *ts, status =acpi_execute_simple_method (ACPI_HANDLE (dev),"INTO" , value);return ACPI_SUCCESS (status) ?0 : -EIO ; +#endif }return -EINVAL ;/* Never reached */
@@ -600,8 +609,8 @@ static int goodix_irq_direction_output(struct goodix_ts_data *ts,static int goodix_irq_direction_input (struct goodix_ts_data *ts) { -struct device *dev = &ts->client->dev; -acpi_status status; +struct device *dev__maybe_unused = &ts->client->dev; +acpi_status status__maybe_unused ;switch (ts->irq_pin_access_method) {case IRQ_PIN_ACCESS_NONE :
@@ -610,12 +619,15 @@ static int goodix_irq_direction_input(struct goodix_ts_data *ts) __func__);return -EINVAL ;case IRQ_PIN_ACCESS_GPIO : +return gpiod_direction_input (ts->gpiod_int); +#ifdef ACPI_GPIO_SUPPORT case IRQ_PIN_ACCESS_ACPI_GPIO :return gpiod_direction_input (ts->gpiod_int);case IRQ_PIN_ACCESS_ACPI_METHOD : status =acpi_evaluate_object (ACPI_HANDLE (dev),"INTI" ,NULL ,NULL );return ACPI_SUCCESS (status) ?0 : -EIO ; +#endif }return -EINVAL ;/* Never reached */
@@ -679,7 +691,7 @@ static int goodix_reset(struct goodix_ts_data *ts)return 0 ; } -#if definedCONFIG_X86 && definedCONFIG_ACPI +#ifdef ACPI_GPIO_SUPPORT #include <asm/cpu_device_id.h> #include <asm/intel-family.h>
@@ -862,6 +874,7 @@ static int goodix_get_gpio_config(struct goodix_ts_data *ts) ts->gpiod_rst = gpiod;switch (ts->irq_pin_access_method) { +#ifdef ACPI_GPIO_SUPPORT case IRQ_PIN_ACCESS_ACPI_GPIO :/* * We end up here if goodix_add_acpi_gpio_mappings() has
@@ -878,6 +891,7 @@ static int goodix_get_gpio_config(struct goodix_ts_data *ts)if (!ts->gpiod_rst) ts->irq_pin_access_method =IRQ_PIN_ACCESS_NONE ;break ; +#endif default :if (ts->gpiod_int && ts->gpiod_rst) { ts->reset_controller_at_probe = true;
Signature · 1 line
2.26.0.rc2
Dmitry Torokhov
maintainerHi Hans,
Quoted 9 lines · Hans de Goede
acpi_evaluate_object()andacpi_execute_simple_method()are not part of the group of ACPI related functions which get stubbed byinclude/linux/acpi.hwhen ACPI support is disabled, so theIRQ_PIN_ACCESS_ACPI_METHODhandling code must be disabled through an #ifdef when ACPI support is not enabled.For consistency also #ifdef out the
IRQ_PIN_ACCESS_ACPI_GPIOcode and use the same #if condition as which is used to replacegoodix_add_acpi_gpio_mappingswith a stub.
I am not big fun of multiple #ifdefs sprinkled through the code, can we do more straightforward stubs, like below?
Thanks!
Signature · 22 lines
Dmitry Input: goodix - fix compilation when ACPI support is disabled From: Hans de Goede <[email protected]> acpi_evaluate_object() and acpi_execute_simple_method() are not part of the group of ACPI related functions which get stubbed by include/linux/acpi.h when ACPI support is disabled, so the IRQ_PIN_ACCESS_ACPI_METHOD handling code must be stubbed out. For consistency use the same #if condition as which is used to replace goodix_add_acpi_gpio_mappings with a stub. Fixes: c5fca485320e ("Input: goodix - add support for controlling the IRQ pin through ACPI methods") Reported-by: kbuild test robot <[email protected]> Signed-off-by: Hans de Goede <[email protected]> [dtor: stubbed out the ACPI method accessors] Signed-off-by: Dmitry Torokhov <[email protected]> --- drivers/input/touchscreen/goodix.c | 55 +++++++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 13 deletions(-)
drivers/input/touchscreen/goodix.c +42 -13
@@ -63,6 +63,11 @@#define MAX_CONTACTS_LOC 5#define TRIGGER_LOC 6 +/* Our special handling for GPIO accesses through ACPI is x86 specific */ +#if definedCONFIG_X86 && definedCONFIG_ACPI +#define ACPI_GPIO_SUPPORT +#endif +struct goodix_ts_data ;enum goodix_irq_pin_access_method {
@@ -600,12 +605,42 @@ static int goodix_send_cfg(struct goodix_ts_data *ts, const u8 *cfg, int len)return 0 ; } -static int goodix_irq_direction_output (struct goodix_ts_data *ts, -int value) +#ifdef ACPI_GPIO_SUPPORT +static int goodix_pin_acpi_direction_input (struct goodix_ts_data *ts) { -struct device *dev = &ts->client->dev; +acpi_handle handle =ACPI_HANDLE (&ts->client->dev);acpi_status status; + status =acpi_evaluate_object (handle,"INTI" ,NULL ,NULL ); +return ACPI_SUCCESS (status) ?0 : -EIO ; +} + +static int goodix_pin_acpi_output_method (struct goodix_ts_data *ts,int value) +{ +acpi_handle handle =ACPI_HANDLE (&ts->client->dev); +acpi_status status; + + status =acpi_execute_simple_method (handle,"INTO" , value); +return ACPI_SUCCESS (status) ?0 : -EIO ; +} +#else +static int goodix_pin_acpi_direction_input (struct goodix_ts_data *ts) +{ +dev_err (&ts->client->dev, +"%s called on device without ACPI support\n" , __func__); +return -EINVAL ; +} + +static int goodix_pin_acpi_output_method (struct goodix_ts_data *ts,int value) +{ +dev_err (&ts->client->dev, +"%s called on device without ACPI support\n" , __func__); +return -EINVAL ; +} +#endif + +static int goodix_irq_direction_output (struct goodix_ts_data *ts,int value) +{switch (ts->irq_pin_access_method) {case IRQ_PIN_ACCESS_NONE : dev_err(&ts->client->dev,
@@ -621,9 +656,7 @@ static int goodix_irq_direction_output(struct goodix_ts_data *ts,*/ return gpiod_direction_output_raw (ts->gpiod_int, value);case IRQ_PIN_ACCESS_ACPI_METHOD : - status =acpi_execute_simple_method (ACPI_HANDLE (dev), -"INTO" , value); -return ACPI_SUCCESS (status) ?0 : -EIO ; +return goodix_pin_acpi_output_method (ts, value); }return -EINVAL ;/* Never reached */
@@ -631,9 +664,6 @@ static int goodix_irq_direction_output(struct goodix_ts_data *ts,static int goodix_irq_direction_input (struct goodix_ts_data *ts) { -struct device *dev = &ts->client->dev; -acpi_status status; -switch (ts->irq_pin_access_method) {case IRQ_PIN_ACCESS_NONE : dev_err(&ts->client->dev,
@@ -641,12 +671,11 @@ static int goodix_irq_direction_input(struct goodix_ts_data *ts) __func__);return -EINVAL ;case IRQ_PIN_ACCESS_GPIO : +return gpiod_direction_input (ts->gpiod_int);case IRQ_PIN_ACCESS_ACPI_GPIO :return gpiod_direction_input (ts->gpiod_int);case IRQ_PIN_ACCESS_ACPI_METHOD : - status =acpi_evaluate_object (ACPI_HANDLE (dev),"INTI" , -NULL ,NULL ); -return ACPI_SUCCESS (status) ?0 : -EIO ; +return goodix_pin_acpi_direction_input (ts); }return -EINVAL ;/* Never reached */
@@ -710,7 +739,7 @@ static int goodix_reset(struct goodix_ts_data *ts)return 0 ; } -#if definedCONFIG_X86 && definedCONFIG_ACPI +#ifdef ACPI_GPIO_SUPPORT #include <asm/cpu_device_id.h> #include <asm/intel-family.h>
Hi,
Quoted 9 lines · Dmitry Torokhov
Hi Hans,
Quoted 6 lines · Hans de Goede
acpi_evaluate_object()andacpi_execute_simple_method()are not part of the group of ACPI related functions which get stubbed byinclude/linux/acpi.hwhen ACPI support is disabled, so theIRQ_PIN_ACCESS_ACPI_METHODhandling code must be disabled through an #ifdef when ACPI support is not enabled.
Quoted 6 lines
Quoted 3 lines
For consistency also #ifdef out the
IRQ_PIN_ACCESS_ACPI_GPIOcode and use the same #if condition as which is used to replacegoodix_add_acpi_gpio_mappingswith a stub.I am not big fun of multiple #ifdefs sprinkled through the code, can we do more straightforward stubs, like below?
The solution you suggested is fine with me.
Regards,
Hans
p.s.
For reference here is Dmitry's solution once again, manually copied because my email client cut it of as being part of the signature:
Input: goodix - fix compilation when ACPI support is disabled
From: Hans de Goede <[email protected]>
acpi_evaluate_object() and acpi_execute_simple_method() are not part of the group of ACPI related functions which get stubbed by include/linux/acpi.h when ACPI support is disabled, so the IRQ_PIN_ACCESS_ACPI_METHOD handling code must be stubbed out.
For consistency use the same #if condition as which is used to replace goodix_add_acpi_gpio_mappings with a stub.
--- drivers/input/touchscreen/goodix.c | 55 +++++++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 13 deletions(-)
drivers/input/touchscreen/goodix.c +42 -13
@@ -63,6 +63,11 @@#define MAX_CONTACTS_LOC 5#define TRIGGER_LOC 6 +/* Our special handling for GPIO accesses through ACPI is x86 specific */ +#if definedCONFIG_X86 && definedCONFIG_ACPI +#define ACPI_GPIO_SUPPORT +#endif +struct goodix_ts_data ;enum goodix_irq_pin_access_method {
@@ -600,12 +605,42 @@ static int goodix_send_cfg(struct goodix_ts_data *ts, const u8 *cfg, int len)return 0 ; } -static int goodix_irq_direction_output (struct goodix_ts_data *ts, -int value) +#ifdef ACPI_GPIO_SUPPORT +static int goodix_pin_acpi_direction_input (struct goodix_ts_data *ts) { -struct device *dev = &ts->client->dev; +acpi_handle handle =ACPI_HANDLE (&ts->client->dev);acpi_status status; + status =acpi_evaluate_object (handle,"INTI" ,NULL ,NULL ); +return ACPI_SUCCESS (status) ?0 : -EIO ; +} + +static int goodix_pin_acpi_output_method (struct goodix_ts_data *ts,int value) +{ +acpi_handle handle =ACPI_HANDLE (&ts->client->dev); +acpi_status status; + + status =acpi_execute_simple_method (handle,"INTO" , value); +return ACPI_SUCCESS (status) ?0 : -EIO ; +} +#else +static int goodix_pin_acpi_direction_input (struct goodix_ts_data *ts) +{ +dev_err (&ts->client->dev, +"%s called on device without ACPI support\n" , __func__); +return -EINVAL ; +} + +static int goodix_pin_acpi_output_method (struct goodix_ts_data *ts,int value) +{ +dev_err (&ts->client->dev, +"%s called on device without ACPI support\n" , __func__); +return -EINVAL ; +} +#endif + +static int goodix_irq_direction_output (struct goodix_ts_data *ts,int value) +{switch (ts->irq_pin_access_method) {case IRQ_PIN_ACCESS_NONE : dev_err(&ts->client->dev,
@@ -621,9 +656,7 @@ static int goodix_irq_direction_output(struct goodix_ts_data *ts,*/ return gpiod_direction_output_raw (ts->gpiod_int, value);case IRQ_PIN_ACCESS_ACPI_METHOD : - status =acpi_execute_simple_method (ACPI_HANDLE (dev), -"INTO" , value); -return ACPI_SUCCESS (status) ?0 : -EIO ; +return goodix_pin_acpi_output_method (ts, value); }return -EINVAL ;/* Never reached */
@@ -631,9 +664,6 @@ static int goodix_irq_direction_output(struct goodix_ts_data *ts,static int goodix_irq_direction_input (struct goodix_ts_data *ts) { -struct device *dev = &ts->client->dev; -acpi_status status; -switch (ts->irq_pin_access_method) {case IRQ_PIN_ACCESS_NONE : dev_err(&ts->client->dev,
@@ -641,12 +671,11 @@ static int goodix_irq_direction_input(struct goodix_ts_data *ts) __func__);return -EINVAL ;case IRQ_PIN_ACCESS_GPIO : +return gpiod_direction_input (ts->gpiod_int);case IRQ_PIN_ACCESS_ACPI_GPIO :return gpiod_direction_input (ts->gpiod_int);case IRQ_PIN_ACCESS_ACPI_METHOD : - status =acpi_evaluate_object (ACPI_HANDLE (dev),"INTI" , -NULL ,NULL ); -return ACPI_SUCCESS (status) ?0 : -EIO ; +return goodix_pin_acpi_direction_input (ts); }return -EINVAL ;/* Never reached */
@@ -710,7 +739,7 @@ static int goodix_reset(struct goodix_ts_data *ts)return 0 ; } -#if definedCONFIG_X86 && definedCONFIG_ACPI +#ifdef ACPI_GPIO_SUPPORT #include <asm/cpu_device_id.h> #include <asm/intel-family.h>
Bastien Nocera
Reviewed-byQuoted 17 lines · Hans de Goede
Hi,
Quoted 14 lines · Dmitry Torokhov
Hi Hans,
Quoted 10 lines · Hans de Goede
acpi_evaluate_object()andacpi_execute_simple_method()are not part of
the group of ACPI related functions which get stubbed byinclude/linux/acpi.hwhen ACPI support is disabled, so theIRQ_PIN_ACCESS_ACPI_METHODhandling code must be disabled through an #ifdef when ACPI support is not enabled.For consistency also #ifdef out the
IRQ_PIN_ACCESS_ACPI_GPIOcode and use the same #if condition as which is used to replacegoodix_add_acpi_gpio_mappingswith a stub.
Quoted 5 lines
Quoted 3 lines
I am not big fun of multiple #ifdefs sprinkled through the code, can we
do more straightforward stubs, like below?The solution you suggested is fine with me.
The patch itself is slightly confusing (it looks like it's renaming functions), but looks pretty much like I requested, so: