Commit 23270e16 authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Marcel Holtmann

Bluetooth: hci_intel: Cleanup the device probe code

There is some unneeded code in "hci_intel" probing. First
acpi_match_device() call is needless as driver/platform/acpi core code has
already done the matching before calling the probe and the driver does not
use the returned pointer to matching _HID other than checking is it NULL.

Then tree wide grep for "hci_intel" doesn't reveal that there is any code
registering this platform device so it looks this device is always backed
with ACPI companion so also ACPI_HANDLE() test can be removed.
Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 4a2fa2b8
...@@ -1165,22 +1165,6 @@ static const struct acpi_device_id intel_acpi_match[] = { ...@@ -1165,22 +1165,6 @@ static const struct acpi_device_id intel_acpi_match[] = {
{ }, { },
}; };
MODULE_DEVICE_TABLE(acpi, intel_acpi_match); MODULE_DEVICE_TABLE(acpi, intel_acpi_match);
static int intel_acpi_probe(struct intel_device *idev)
{
const struct acpi_device_id *id;
id = acpi_match_device(intel_acpi_match, &idev->pdev->dev);
if (!id)
return -ENODEV;
return 0;
}
#else
static int intel_acpi_probe(struct intel_device *idev)
{
return -ENODEV;
}
#endif #endif
#ifdef CONFIG_PM #ifdef CONFIG_PM
...@@ -1248,14 +1232,6 @@ static int intel_probe(struct platform_device *pdev) ...@@ -1248,14 +1232,6 @@ static int intel_probe(struct platform_device *pdev)
idev->pdev = pdev; idev->pdev = pdev;
if (ACPI_HANDLE(&pdev->dev)) {
int err = intel_acpi_probe(idev);
if (err)
return err;
} else {
return -ENODEV;
}
idev->reset = devm_gpiod_get_optional(&pdev->dev, "reset", idev->reset = devm_gpiod_get_optional(&pdev->dev, "reset",
GPIOD_OUT_LOW); GPIOD_OUT_LOW);
if (IS_ERR(idev->reset)) { if (IS_ERR(idev->reset)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment