On 05/20/2014 04:50 PM, Mika Westerberg wrote: > On Tue, May 20, 2014 at 04:43:12PM +0800, Aaron Lu wrote: >> The GPIO operation region handler should be called where sleep is >> allowed, so we should use the *_cansleep version of gpiod_get/set APIs >> or we will get a warning message complaining invalid context if the GPIO >> chip has the cansleep flag set. >> >> Signed-off-by: Aaron Lu <[email protected]> >> Acked-by: Mika Westerberg <[email protected]> >> --- >> drivers/gpio/gpiolib-acpi.c | 6 ++++-- >> 1 file changed, 4 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c >> index bf0f8b4..2d398a6 100644 >> --- a/drivers/gpio/gpiolib-acpi.c >> +++ b/drivers/gpio/gpiolib-acpi.c >> @@ -17,6 +17,7 @@ >> #include <linux/acpi.h> >> #include <linux/interrupt.h> >> #include <linux/mutex.h> >> +#include <linux/gpio.h> > > Why the above include? > > (Sorry I just noticed this now).
My bad - I used the gpio_set_value_cansleep at first which requires the inclusion of that header file. Later, I found that I should use the gpiod_set_raw_value_cansleep instead but forgot to remove that header. Will remove the inclusion in v2, thanks for the remind! -Aaron > >> >> #include "gpiolib.h" >> >> @@ -449,9 +450,10 @@ acpi_gpio_adr_space_handler(u32 function, >> acpi_physical_address address, >> mutex_unlock(&achip->conn_lock); >> >> if (function == ACPI_WRITE) >> - gpiod_set_raw_value(desc, !!((1 << i) & *value)); >> + gpiod_set_raw_value_cansleep(desc, >> + !!((1 << i) & *value)); >> else >> - *value |= gpiod_get_raw_value(desc) << i; >> + *value |= gpiod_get_raw_value_cansleep(desc) << i; >> } >> >> out: >> -- >> 1.9.0 -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
