diff options
| author |   Jarkko Nikula <jarkko.nikula@linux.intel.com> | 2015-09-30 16:26:44 +0300 |
|---|---|---|
| committer |   Marcel Holtmann <marcel@holtmann.org> | 2015-10-01 10:03:37 +0200 |
| commit | 4d1c4558028ff0b7dbc1e24c319f478658f0620d (patch) | |
| tree | 8c88facff674c24744664786692cbf864e649887 /drivers/bluetooth/hci_bcm.c | |
| parent | Bluetooth: hci_bcm: Remove needless acpi_match_device() call (diff) | |
| download | linux-dev-4d1c4558028ff0b7dbc1e24c319f478658f0620d.tar.xz linux-dev-4d1c4558028ff0b7dbc1e24c319f478658f0620d.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | drivers/bluetooth/hci_bcm.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c index a1b9bbcbcb79..967d16692925 100644 --- a/drivers/bluetooth/hci_bcm.c +++ b/drivers/bluetooth/hci_bcm.c @@ -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; - } + ret = bcm_acpi_probe(dev); + if (ret) + return ret; platform_set_drvdata(pdev, dev); |