diff options
author | Jarkko Nikula <jarkko.nikula@linux.intel.com> | 2015-09-30 09:26:43 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2015-10-01 04:03:37 -0400 |
commit | 5fbae60d43652edc005f1a690345ec7e290def8e (patch) | |
tree | f1f96bffc2b7d52452ee627f7bda222cd6ccbcc7 /drivers/bluetooth | |
parent | 5be00284dc85dadd5241833fbca645c19baebebb (diff) |
Bluetooth: hci_bcm: Remove needless acpi_match_device() call
There is no need to call acpi_match_device() in driver's probe path and
verify does it find a match to given ACPI _HIDs in .acpi_match_table as
driver/platform/acpi core code has found the match prior calling the probe.
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth')
-rw-r--r-- | drivers/bluetooth/hci_bcm.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c index 5375c9c04fda..a1b9bbcbcb79 100644 --- a/drivers/bluetooth/hci_bcm.c +++ b/drivers/bluetooth/hci_bcm.c | |||
@@ -647,16 +647,11 @@ static int bcm_resource(struct acpi_resource *ares, void *data) | |||
647 | static int bcm_acpi_probe(struct bcm_device *dev) | 647 | static int bcm_acpi_probe(struct bcm_device *dev) |
648 | { | 648 | { |
649 | struct platform_device *pdev = dev->pdev; | 649 | struct platform_device *pdev = dev->pdev; |
650 | const struct acpi_device_id *id; | ||
651 | struct acpi_device *adev; | 650 | struct acpi_device *adev; |
652 | LIST_HEAD(resources); | 651 | LIST_HEAD(resources); |
653 | const struct dmi_system_id *dmi_id; | 652 | const struct dmi_system_id *dmi_id; |
654 | int ret; | 653 | int ret; |
655 | 654 | ||
656 | id = acpi_match_device(pdev->dev.driver->acpi_match_table, &pdev->dev); | ||
657 | if (!id) | ||
658 | return -ENODEV; | ||
659 | |||
660 | /* Retrieve GPIO data */ | 655 | /* Retrieve GPIO data */ |
661 | dev->name = dev_name(&pdev->dev); | 656 | dev->name = dev_name(&pdev->dev); |
662 | ret = acpi_dev_add_driver_gpios(ACPI_COMPANION(&pdev->dev), | 657 | ret = acpi_dev_add_driver_gpios(ACPI_COMPANION(&pdev->dev), |