Re: [PATCH] wifi: ath10k: Drop redundant NULL check on devm_clk_get()
Jeff Johnson <[email protected]> Mon, 13 Jul 2026 15:31:27 -0700
| Newsgroups | org.infradead.lists.ath10k,org.kernel.vger.linux-kernel,org.kernel.vger.linux-wireless |
|---|---|
| Message-ID | <[email protected]> |
On 7/5/2026 10:24 AM, Krzysztof Kozlowski wrote: > devm_clk_get() does not return NULL (only valid clock or ERR pointer), > so simplify the code to drop redundant IS_ERR_OR_NULL(). FWIW my AI review agent says: Under !CONFIG_HAVE_CLK (x86 COMPILE_TEST), devm_clk_get() returns NULL; IS_ERR(NULL) is false so clock_init() returns 0 with NULL clocks stored Perhaps the stub function in include/linux/clk.h should be updated to return an ERR_PTR() instead of NULL? > > Signed-off-by: Krzysztof Kozlowski <[email protected]> > --- > drivers/net/wireless/ath/ath10k/ahb.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath10k/ahb.c b/drivers/net/wireless/ath/ath10k/ahb.c > index eb8b35b6224d..7456f885d2b5 100644 > --- a/drivers/net/wireless/ath/ath10k/ahb.c > +++ b/drivers/net/wireless/ath/ath10k/ahb.c > @@ -87,24 +87,24 @@ static int ath10k_ahb_clock_init(struct ath10k *ar) > dev = &ar_ahb->pdev->dev; > > ar_ahb->cmd_clk = devm_clk_get(dev, "wifi_wcss_cmd"); > - if (IS_ERR_OR_NULL(ar_ahb->cmd_clk)) { > + if (IS_ERR(ar_ahb->cmd_clk)) { > ath10k_err(ar, "failed to get cmd clk: %ld\n", > PTR_ERR(ar_ahb->cmd_clk)); > - return ar_ahb->cmd_clk ? PTR_ERR(ar_ahb->cmd_clk) : -ENODEV; > + return PTR_ERR(ar_ahb->cmd_clk); > } > > ar_ahb->ref_clk = devm_clk_get(dev, "wifi_wcss_ref"); > - if (IS_ERR_OR_NULL(ar_ahb->ref_clk)) { > + if (IS_ERR(ar_ahb->ref_clk)) { > ath10k_err(ar, "failed to get ref clk: %ld\n", > PTR_ERR(ar_ahb->ref_clk)); > - return ar_ahb->ref_clk ? PTR_ERR(ar_ahb->ref_clk) : -ENODEV; > + return PTR_ERR(ar_ahb->ref_clk); > } > > ar_ahb->rtc_clk = devm_clk_get(dev, "wifi_wcss_rtc"); > - if (IS_ERR_OR_NULL(ar_ahb->rtc_clk)) { > + if (IS_ERR(ar_ahb->rtc_clk)) { > ath10k_err(ar, "failed to get rtc clk: %ld\n", > PTR_ERR(ar_ahb->rtc_clk)); > - return ar_ahb->rtc_clk ? PTR_ERR(ar_ahb->rtc_clk) : -ENODEV; > + return PTR_ERR(ar_ahb->rtc_clk); > } > > return 0;