Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 366380cd authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Chanwoo Choi
Browse files

Revert "extcon: usb-gpio: add support for ACPI gpio interface" 



The commit 942c7924 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 942c7924 to avoid any confusion in the future.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarChanwoo Choi <cw00.choi@samsung.com>
parent c02ed2e7

drivers/extcon/extcon-usb-gpio.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/workqueue.h>

#include <linux/workqueue.h>

#include <linux/acpi.h>

#include <linux/pinctrl/consumer.h>

#include <linux/pinctrl/consumer.h>





#define USB_GPIO_DEBOUNCE_MS	20	/* ms */

#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;

	struct usb_extcon_info *info;

	int ret;

	int ret;





	if (!np && !ACPI_HANDLE(dev))

	if (!np)

		return -EINVAL;

		return -EINVAL;





	info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);

	info = devm_kzalloc(&pdev->dev, sizeof(*info), GFP_KERNEL);