From: John Crispin Date: Fri, 12 Feb 2016 08:29:11 +0000 (+0000) Subject: kernel: gpio-button-hotplug: update to use threaded irq's X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=69517e88bea6ac19626dbff16cdc5e4a9f55cc25;p=openwrt%2Fstaging%2Fkaloz.git kernel: gpio-button-hotplug: update to use threaded irq's Many gpio controllers 'cansleep' due to the fact that they are behind busses e.g. i2c etc. Using threaded irq's allows for 'sleep-able' gpio's to be used. Signed-off-by: Pushpal Sidhu Signed-off-by: Tim Harvey SVN-Revision: 48696 --- diff --git a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c index 029a388d0e..6d1a197d61 100644 --- a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c +++ b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c @@ -555,20 +555,17 @@ static int gpio_keys_probe(struct platform_device *pdev) struct gpio_keys_button *button = &pdata->buttons[i]; struct gpio_keys_button_data *bdata = &bdev->data[i]; - if (bdata->can_sleep) { - dev_err(&pdev->dev, "skipping gpio:%d, it can sleep\n", button->gpio); - continue; - } if (!button->irq) button->irq = gpio_to_irq(button->gpio); if (button->irq < 0) { dev_err(&pdev->dev, "failed to get irq for gpio:%d\n", button->gpio); continue; } - ret = devm_request_irq(&pdev->dev, button->irq, button_handle_irq, - IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, - dev_name(&pdev->dev), bdata); - if (ret) + + ret = devm_request_threaded_irq(&pdev->dev, button->irq, NULL, button_handle_irq, + IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, + dev_name(&pdev->dev), bdata); + if (ret < 0) dev_err(&pdev->dev, "failed to request irq:%d for gpio:%d\n", button->irq, button->gpio); else dev_dbg(&pdev->dev, "gpio:%d has irq:%d\n", button->gpio, button->irq);