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

Commit e98d6d62 authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Marcel Holtmann
Browse files

Bluetooth: hci_bcm: Do not test ACPI companion in bcm_acpi_probe() 



This device has always ACPI companion because driver supports only ACPI
enumeration. Therefore there is no need to test it in bcm_acpi_probe() and
we can pass it directly to acpi_dev_get_resources() (which will return
-EINVAL in case of NULL argument is passed).

Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 4d1c4558

drivers/bluetooth/hci_bcm.c

+2 −6
Original line number Original line Diff line number Diff line
@@ -647,7 +647,6 @@ static int bcm_resource(struct acpi_resource *ares, void *data) 
static int bcm_acpi_probe(struct bcm_device *dev)

static int bcm_acpi_probe(struct bcm_device *dev)

{

{

	struct platform_device *pdev = dev->pdev;

	struct platform_device *pdev = dev->pdev;

	struct acpi_device *adev;

	LIST_HEAD(resources);

	LIST_HEAD(resources);

	const struct dmi_system_id *dmi_id;

	const struct dmi_system_id *dmi_id;

	int ret;

	int ret;
@@ -696,11 +695,8 @@ static int bcm_acpi_probe(struct bcm_device *dev) 
	}

	}





	/* Retrieve UART ACPI info */

	/* Retrieve UART ACPI info */

	adev = ACPI_COMPANION(&dev->pdev->dev);

	ret = acpi_dev_get_resources(ACPI_COMPANION(&dev->pdev->dev),

	if (!adev)

				     &resources, bcm_resource, dev);

		return 0;



	ret = acpi_dev_get_resources(adev, &resources, bcm_resource, dev);

	if (ret < 0)

	if (ret < 0)

		return ret;

		return ret;

	acpi_dev_free_resource_list(&resources);

	acpi_dev_free_resource_list(&resources);