Bluetooth: hci_intel: Cleanup the device probe code
Subsystems (2)
PATCH 1/1 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.
--- drivers/bluetooth/hci_intel.c | 24 ------------------------ 1 file changed, 24 deletions(-)
drivers/bluetooth/hci_intel.c +0 -24
@@ -1165,22 +1165,6 @@ static const struct acpi_device_id 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 #ifdef CONFIG_PM
@@ -1248,14 +1232,6 @@ static int intel_probe(struct platform_device *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" ,GPIOD_OUT_LOW );if (IS_ERR (idev->reset)) {
Signature · 1 line
2.5.3
A message that is not in the archive (sent off-list or not yet received): 1443619732-19401-1-git-send-email-jarkko.nikula-VuQAYsv1563Yd54FQh9/[email protected]
Hi Jarkko,
Quoted 8 lines
There is some unneeded code in "
hci_intel" probing. Firstacpi_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_HIDother 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 alsoACPI_HANDLE()test can be removed.
eventually there will be DT platform device. Does that make a difference or is it still valid to remove this probe handling.
Regards
Marcel
A message that is not in the archive (sent off-list or not yet received): 9BB7E6C8-A45E-4D88-8B01-D1660370B7FF-kz+m5ild9QBg9hUCZPvPmw@public.gmane.org
Quoted 7 lines · Marcel Holtmann
Hi Jarkko,
Quoted 5 lines
There is some unneeded code in "
hci_intel" probing. Firstacpi_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_HIDother than checking is it NULL.
Quoted 6 lines
Quoted 3 lines
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 alsoACPI_HANDLE()test can be removed.eventually there will be DT platform device. Does that make a difference or is it still valid to remove this probe handling.
Also with DT matching the acpi_match_device() is needless. Adding DT support here means just adding pointer to OF match table like below and core will call the probe if there is a match to "hci_intel" platform device, ACPI _HID or OF node.
static struct platform_driver intel_driver = {
.driver = {
.name = "hci_intel",
.acpi_match_table = ACPI_PTR(intel_acpi_match),
.of_match_table = of_match_ptr(intel_of_match),
},
};If there is need to differentiate between these in probe the driver could do for instance
if (has_acpi_companion(&pdev->dev)) {
/* ACPI enumerated */
} else if (pdev->dev.of_node) {
/* DT enumerated */
} else {
/* platform device */
}Signature · 1 line
Jarkko
Marcel Holtmann
maintainerHi Jarkko,
Quoted 5 lines
There is some unneeded code in "
hci_intel" probing. Firstacpi_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_HIDother than checking is it NULL.
Quoted 8 lines
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 alsoACPI_HANDLE()test can be removed.Signed-off-by Jarkko Nikula <[email protected]>---
drivers/bluetooth/hci_intel.c| 24 ------------------------1 file changed, 24 deletions(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel