Commit 30ce1c03 authored by Wentong Wu's avatar Wentong Wu Committed by Greg Kroah-Hartman
Browse files

usb: misc: ljca: Drop _ADR support to get ljca children devices 



Currently the shipped platforms use only _HID to distinguish
ljca children devices. The _ADR support here is for future HW.
This patch is to drop _ADR support and we can then re-introduce
it (revert this patch) if future HW actually starts using _ADR
to distinguish children devices.

Signed-off-by: default avatarWentong Wu <wentong.wu@intel.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20231114072531.1366753-1-wentong.wu@intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 58f2fcb3

drivers/usb/misc/usb-ljca.c

+2 −12
Original line number Diff line number Diff line
@@ -457,8 +457,8 @@ static void ljca_auxdev_acpi_bind(struct ljca_adapter *adap, 
				  u64 adr, u8 id)

{

	struct ljca_match_ids_walk_data wd = { 0 };

	struct acpi_device *parent, *adev;

	struct device *dev = adap->dev;

	struct acpi_device *parent;

	char uid[4];



	parent = ACPI_COMPANION(dev);
@@ -466,17 +466,7 @@ static void ljca_auxdev_acpi_bind(struct ljca_adapter *adap, 
		return;



	/*

	 * get auxdev ACPI handle from the ACPI device directly

	 * under the parent that matches _ADR.

	 */

	adev = acpi_find_child_device(parent, adr, false);

	if (adev) {

		ACPI_COMPANION_SET(&auxdev->dev, adev);

		return;

	}



	/*

	 * _ADR is a grey area in the ACPI specification, some

	 * Currently LJCA hw doesn't use _ADR instead the shipped

	 * platforms use _HID to distinguish children devices.

	 */

	switch (adr) {