Commit 4d1c4558 authored Sep 30, 2015 by Jarkko Nikula Committed by Marcel Holtmann Oct 01, 2015

Bluetooth: hci_bcm: Remove needless looking code

Tree wide grep for "hci_bcm" doesn't reveal there is any code registering
this platform device and "struct acpi_device_id" use for passing the
platform data looks a debug/test code leftover to me.

I'm assuming this driver effectively supports only ACPI enumeration and
thus test for ACPI_HANDLE() and platform data can be removed.

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

parent 5fbae60d

drivers/bluetooth/hci_bcm.c

+3 −10

Original line number	Diff line number	Diff line
		@@ -724,7 +724,6 @@ static int bcm_acpi_probe(struct bcm_device *dev)
		static int bcm_probe(struct platform_device *pdev)
		{
		struct bcm_device *dev;
		struct acpi_device_id *pdata = pdev->dev.platform_data;
		int ret;

		dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
		@@ -733,15 +732,9 @@ static int bcm_probe(struct platform_device *pdev)

		dev->pdev = pdev;

		if (ACPI_HANDLE(&pdev->dev)) {
		ret = bcm_acpi_probe(dev);
		if (ret)
		return ret;
		} else if (pdata) {
		dev->name = pdata->id;
		} else {
		return -ENODEV;
		}

		platform_set_drvdata(pdev, dev);