]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Revert "extcon: usb-gpio: add support for ACPI gpio interface"
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 21 Mar 2017 18:37:47 +0000 (20:37 +0200)
committerChanwoo Choi <cw00.choi@samsung.com>
Mon, 27 Mar 2017 04:17:41 +0000 (13:17 +0900)
The commit 942c7924a51e introduced a check for ACPI handle for the
device that never appears on any ACPI-enabled platform so far. It seems
a confusion with extcon-intel-int3496 which does support ACPI-enabled
platforms.

Revert commit 942c7924a51e to avoid any confusion in the future.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
drivers/extcon/extcon-usb-gpio.c

index a5e1882b4ca66e370f4c52c7c024290a1685afd7..a0d7de8675e05990b9d93181587d59ec40127476 100644 (file)
@@ -26,7 +26,6 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/workqueue.h>
-#include <linux/acpi.h>
 #include <linux/pinctrl/consumer.h>
 
 #define USB_GPIO_DEBOUNCE_MS   20      /* ms */
@@ -111,7 +110,7 @@ static int usb_extcon_probe(struct platform_device *pdev)
        struct usb_extcon_info *info;
        int ret;
 
-       if (!np && !ACPI_HANDLE(dev))
+       if (!np)
                return -EINVAL;
 
        info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);