Skip to content

Commit

Permalink
Bluetooth: hci_bcm: Use the devm_clk_get_optional() helper
Browse files Browse the repository at this point in the history
Use devm_clk_get_optional() instead of hand writing it.
This saves some LoC and improves the semantic.

Signed-off-by: Andy Shevchenko <[email protected]>
Signed-off-by: Luiz Augusto von Dentz <[email protected]>
  • Loading branch information
andy-shev authored and Vudentz committed Nov 14, 2024
1 parent 07a9342 commit 2de33a2
Showing 1 changed file with 8 additions and 17 deletions.
25 changes: 8 additions & 17 deletions drivers/bluetooth/hci_bcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -1068,17 +1068,17 @@ static struct clk *bcm_get_txco(struct device *dev)
struct clk *clk;

/* New explicit name */
clk = devm_clk_get(dev, "txco");
if (!IS_ERR(clk) || PTR_ERR(clk) == -EPROBE_DEFER)
clk = devm_clk_get_optional(dev, "txco");
if (clk)
return clk;

/* Deprecated name */
clk = devm_clk_get(dev, "extclk");
if (!IS_ERR(clk) || PTR_ERR(clk) == -EPROBE_DEFER)
clk = devm_clk_get_optional(dev, "extclk");
if (clk)
return clk;

/* Original code used no name at all */
return devm_clk_get(dev, NULL);
return devm_clk_get_optional(dev, NULL);
}

static int bcm_get_resources(struct bcm_device *dev)
Expand All @@ -1093,21 +1093,12 @@ static int bcm_get_resources(struct bcm_device *dev)
return 0;

dev->txco_clk = bcm_get_txco(dev->dev);

/* Handle deferred probing */
if (dev->txco_clk == ERR_PTR(-EPROBE_DEFER))
return PTR_ERR(dev->txco_clk);

/* Ignore all other errors as before */
if (IS_ERR(dev->txco_clk))
dev->txco_clk = NULL;

dev->lpo_clk = devm_clk_get(dev->dev, "lpo");
if (dev->lpo_clk == ERR_PTR(-EPROBE_DEFER))
return PTR_ERR(dev->lpo_clk);
return PTR_ERR(dev->txco_clk);

dev->lpo_clk = devm_clk_get_optional(dev->dev, "lpo");
if (IS_ERR(dev->lpo_clk))
dev->lpo_clk = NULL;
return PTR_ERR(dev->lpo_clk);

/* Check if we accidentally fetched the lpo clock twice */
if (dev->lpo_clk && clk_is_match(dev->lpo_clk, dev->txco_clk)) {
Expand Down

0 comments on commit 2de33a2

Please sign in to comment.