From: Jarkko Nikula Date: Wed, 30 Sep 2015 13:26:45 +0000 (+0300) Subject: Bluetooth: hci_bcm: Do not test ACPI companion in bcm_acpi_probe() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e98d6d6203552ebd1e80ac17de857547efa37fba;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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: Jarkko Nikula Signed-off-by: Marcel Holtmann --- diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c index 967d16692925..512873262055 100644 --- a/drivers/bluetooth/hci_bcm.c +++ b/drivers/bluetooth/hci_bcm.c @@ -647,7 +647,6 @@ static int bcm_resource(struct acpi_resource *ares, void *data) static int bcm_acpi_probe(struct bcm_device *dev) { struct platform_device *pdev = dev->pdev; - struct acpi_device *adev; LIST_HEAD(resources); const struct dmi_system_id *dmi_id; int ret; @@ -696,11 +695,8 @@ static int bcm_acpi_probe(struct bcm_device *dev) } /* Retrieve UART ACPI info */ - adev = ACPI_COMPANION(&dev->pdev->dev); - if (!adev) - return 0; - - ret = acpi_dev_get_resources(adev, &resources, bcm_resource, dev); + ret = acpi_dev_get_resources(ACPI_COMPANION(&dev->pdev->dev), + &resources, bcm_resource, dev); if (ret < 0) return ret; acpi_dev_free_resource_list(&resources);