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>

diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
index 800132369134973122122a07e4de434f87462d3d..ff73ecb8215f8bfe5cb1dcfc1f1df78ccca2fa17 100644 (file)
--- a/drivers/bluetooth/hci_bcm.c
+++ b/drivers/bluetooth/hci_bcm.c
@@ -214,7 +214,7 @@ static int bcm_gpio_set_power(struct bcm_device *dev, bool powered)
 {
        int err;
 
-       if (powered && !IS_ERR(dev->clk) && !dev->clk_enabled) {
+       if (powered && !dev->clk_enabled) {
                err = clk_prepare_enable(dev->clk);
                if (err)
                        return err;
@@ -228,7 +228,7 @@ static int bcm_gpio_set_power(struct bcm_device *dev, bool powered)
        if (err)
                goto err_revert_shutdown;
 
-       if (!powered && !IS_ERR(dev->clk) && dev->clk_enabled)
+       if (!powered && dev->clk_enabled)
                clk_disable_unprepare(dev->clk);
 
        dev->clk_enabled = powered;
@@ -238,7 +238,7 @@ static int bcm_gpio_set_power(struct bcm_device *dev, bool powered)
 err_revert_shutdown:
        dev->set_shutdown(dev, !powered);
 err_clk_disable:
-       if (powered && !IS_ERR(dev->clk) && !dev->clk_enabled)
+       if (powered && !dev->clk_enabled)
                clk_disable_unprepare(dev->clk);
        return err;
 }
@@ -911,6 +911,10 @@ static int bcm_get_resources(struct bcm_device *dev)
        if (dev->clk == ERR_PTR(-EPROBE_DEFER))
                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",
                                                     GPIOD_OUT_LOW);
        if (IS_ERR(dev->device_wakeup))