[PATCH] ath10k: fix the status check and wrong return

[Tang Bin]

In the function ath10k_ahb_clock_init(), devm_clk_get() doesn't
return NULL. Thus use IS_ERR() and PTR_ERR() to validate
the returned value instead of IS_ERR_OR_NULL().

Signed-off-by: Zhang Shengju <zhangshen...@cmss.chinamobile.com>
Signed-off-by: Tang Bin <tang...@cmss.chinamobile.com>
---
 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 ed87bc00f..ea669af6a 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;
-- 
2.20.1.windows.1