MLK-15032-2 Revert "extcon: usb-gpio: add pinctrl operation during system PM"
authorLi Jun <jun.li@nxp.com>
Fri, 9 Jun 2017 10:29:22 +0000 (18:29 +0800)
committerNitin Garg <nitin.garg@nxp.com>
Mon, 19 Mar 2018 20:28:10 +0000 (15:28 -0500)
This reverts commit 4c7d332e3316 ("MLK-13638-3 extcon: usb-gpio: add
pinctrl operation during system PM"). We will use the upstream version.

Reviewed-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Li Jun <jun.li@nxp.com>
drivers/extcon/extcon-usb-gpio.c

index a72ad07..a27d350 100644 (file)
@@ -23,7 +23,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/of_gpio.h>
-#include <linux/pinctrl/consumer.h>
 #include <linux/platform_device.h>
 #include <linux/pm_wakeirq.h>
 #include <linux/slab.h>
@@ -177,7 +176,6 @@ static int usb_extcon_suspend(struct device *dev)
         * accessible until resume completes. So disable IRQ.
         */
        disable_irq(info->id_irq);
-       pinctrl_pm_select_sleep_state(dev);
 
        return ret;
 }
@@ -187,7 +185,6 @@ static int usb_extcon_resume(struct device *dev)
        struct usb_extcon_info *info = dev_get_drvdata(dev);
        int ret = 0;
 
-       pinctrl_pm_select_default_state(dev);
        enable_irq(info->id_irq);
        if (!device_may_wakeup(dev))
                queue_delayed_work(system_power_efficient_wq,