Skip to content

Commit

Permalink
Bluetooth: hci_bcm: improve use of gpios API
Browse files Browse the repository at this point in the history
devm_gpiod_get currently has an optional parameter to set initial
direction and value for the requested gpio. Make use of this to simplify
the driver and make it not fail to build when this parameter is made
mandatory (which is scheduled for 4.3-rc1).

Moreover use the _optional variant of devm_gpiod_get to simplify error
handling (which also gets more strict for free).

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
  • Loading branch information
Uwe Kleine-König authored and Marcel Holtmann committed Aug 12, 2015
1 parent ea9eb69 commit 62aaefa
Showing 1 changed file with 9 additions and 15 deletions.
24 changes: 9 additions & 15 deletions drivers/bluetooth/hci_bcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,6 @@ static int bcm_acpi_probe(struct bcm_device *dev)
{
struct platform_device *pdev = dev->pdev;
const struct acpi_device_id *id;
struct gpio_desc *gpio;
struct acpi_device *adev;
LIST_HEAD(resources);
int ret;
Expand All @@ -426,21 +425,16 @@ static int bcm_acpi_probe(struct bcm_device *dev)

dev->clk = devm_clk_get(&pdev->dev, NULL);

gpio = devm_gpiod_get(&pdev->dev, "device-wakeup");
if (!IS_ERR(gpio)) {
ret = gpiod_direction_output(gpio, 0);
if (ret)
return ret;
dev->device_wakeup = gpio;
}
dev->device_wakeup = devm_gpiod_get_optional(&pdev->dev,
"device-wakeup",
GPIOD_OUT_LOW);
if (IS_ERR(dev->device_wakeup))
return PTR_ERR(dev->device_wakeup);

gpio = devm_gpiod_get(&pdev->dev, "shutdown");
if (!IS_ERR(gpio)) {
ret = gpiod_direction_output(gpio, 0);
if (ret)
return ret;
dev->shutdown = gpio;
}
dev->shutdown = devm_gpiod_get_optional(&pdev->dev, "shutdown",
GPIOD_OUT_LOW);
if (IS_ERR(dev->shutdown))
return PTR_ERR(dev->shutdown);

/* Make sure at-least one of the GPIO is defined and that
* a name is specified for this instance
Expand Down

0 comments on commit 62aaefa

Please sign in to comment.