Bluetooth: hci_bcm: Simplify clk_get error handling
The driver currently checks the clk pointer for an error condition, as returned by clk_get, before every invocation of the clk consumer API. This is redundant if the goal is simply to ignore the errors, thereby making the clk optional. The clk consumer API already checks if the pointer is NULL or not. Simplify the code a bit by assigning NULL to the clk pointer if the error condition is one we want to ignore, which is every error except deferred probing. Tested-by: Ondrej Jirman <megous@megous.com> Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
parent
28ac03b9ac
commit
8c08947b7c
|
@ -214,7 +214,7 @@ static int bcm_gpio_set_power(struct bcm_device *dev, bool powered)
|
||||||
{
|
{
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
if (powered && !IS_ERR(dev->clk) && !dev->clk_enabled) {
|
if (powered && !dev->clk_enabled) {
|
||||||
err = clk_prepare_enable(dev->clk);
|
err = clk_prepare_enable(dev->clk);
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
|
@ -228,7 +228,7 @@ static int bcm_gpio_set_power(struct bcm_device *dev, bool powered)
|
||||||
if (err)
|
if (err)
|
||||||
goto err_revert_shutdown;
|
goto err_revert_shutdown;
|
||||||
|
|
||||||
if (!powered && !IS_ERR(dev->clk) && dev->clk_enabled)
|
if (!powered && dev->clk_enabled)
|
||||||
clk_disable_unprepare(dev->clk);
|
clk_disable_unprepare(dev->clk);
|
||||||
|
|
||||||
dev->clk_enabled = powered;
|
dev->clk_enabled = powered;
|
||||||
|
@ -238,7 +238,7 @@ static int bcm_gpio_set_power(struct bcm_device *dev, bool powered)
|
||||||
err_revert_shutdown:
|
err_revert_shutdown:
|
||||||
dev->set_shutdown(dev, !powered);
|
dev->set_shutdown(dev, !powered);
|
||||||
err_clk_disable:
|
err_clk_disable:
|
||||||
if (powered && !IS_ERR(dev->clk) && !dev->clk_enabled)
|
if (powered && !dev->clk_enabled)
|
||||||
clk_disable_unprepare(dev->clk);
|
clk_disable_unprepare(dev->clk);
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
@ -911,6 +911,10 @@ static int bcm_get_resources(struct bcm_device *dev)
|
||||||
if (dev->clk == ERR_PTR(-EPROBE_DEFER))
|
if (dev->clk == ERR_PTR(-EPROBE_DEFER))
|
||||||
return PTR_ERR(dev->clk);
|
return PTR_ERR(dev->clk);
|
||||||
|
|
||||||
|
/* Ignore all other errors as before */
|
||||||
|
if (IS_ERR(dev->clk))
|
||||||
|
dev->clk = NULL;
|
||||||
|
|
||||||
dev->device_wakeup = devm_gpiod_get_optional(dev->dev, "device-wakeup",
|
dev->device_wakeup = devm_gpiod_get_optional(dev->dev, "device-wakeup",
|
||||||
GPIOD_OUT_LOW);
|
GPIOD_OUT_LOW);
|
||||||
if (IS_ERR(dev->device_wakeup))
|
if (IS_ERR(dev->device_wakeup))
|
||||||
|
|
Loading…
Reference in New Issue