Skip to content

Commit 30ce1c0

Browse files
wentongwugregkh
authored andcommitted
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: Wentong Wu <wentong.wu@intel.com> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://lore.kernel.org/r/20231114072531.1366753-1-wentong.wu@intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 58f2fcb commit 30ce1c0

1 file changed

Lines changed: 2 additions & 12 deletions

File tree

drivers/usb/misc/usb-ljca.c

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -457,26 +457,16 @@ static void ljca_auxdev_acpi_bind(struct ljca_adapter *adap,
457457
u64 adr, u8 id)
458458
{
459459
struct ljca_match_ids_walk_data wd = { 0 };
460-
struct acpi_device *parent, *adev;
461460
struct device *dev = adap->dev;
461+
struct acpi_device *parent;
462462
char uid[4];
463463

464464
parent = ACPI_COMPANION(dev);
465465
if (!parent)
466466
return;
467467

468468
/*
469-
* get auxdev ACPI handle from the ACPI device directly
470-
* under the parent that matches _ADR.
471-
*/
472-
adev = acpi_find_child_device(parent, adr, false);
473-
if (adev) {
474-
ACPI_COMPANION_SET(&auxdev->dev, adev);
475-
return;
476-
}
477-
478-
/*
479-
* _ADR is a grey area in the ACPI specification, some
469+
* Currently LJCA hw doesn't use _ADR instead the shipped
480470
* platforms use _HID to distinguish children devices.
481471
*/
482472
switch (adr) {

0 commit comments

Comments
 (0)