diff options
| author |   Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-03-21 20:37:47 +0200 |
|---|---|---|
| committer |   Chanwoo Choi <cw00.choi@samsung.com> | 2017-03-27 13:17:41 +0900 |
| commit | 366380cd62f4fce82d970e9a510d0510b4dea5ee (patch) | |
| tree | 4b6a4ff84251a0be9d5edf8c66dc95ef15c6b78a /drivers/extcon | |
| parent | Linux 4.11-rc4 (diff) | |
| download | linux-dev-366380cd62f4fce82d970e9a510d0510b4dea5ee.tar.xz linux-dev-366380cd62f4fce82d970e9a510d0510b4dea5ee.zip | |
Revert "extcon: usb-gpio: add support for ACPI gpio interface"
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>
Diffstat (limited to 'drivers/extcon')
| -rw-r--r-- | drivers/extcon/extcon-usb-gpio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/extcon/extcon-usb-gpio.c b/drivers/extcon/extcon-usb-gpio.c index a5e1882b4ca6..a0d7de8675e0 100644 --- a/drivers/extcon/extcon-usb-gpio.c +++ b/drivers/extcon/extcon-usb-gpio.c @@ -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); |