ath10k: do not check if reset is NULL

Since reset_control_get() never returns NULL, we can use IS_ERR()
instead of IS_ERR_OR_NULL().  The return statements can be simpler
as well.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

1 files changed, 10 insertions, 15 deletions

diff --git a/drivers/net/wireless/ath/ath10k/ahb.c b/drivers/net/wireless/ath/ath10k/ahb.c
index 751b7fed536d..fe38b459544d 100644
--- a/drivers/net/wireless/ath/ath10k/ahb.c
+++ b/drivers/net/wireless/ath/ath10k/ahb.c
@@ -195,43 +195,38 @@ static int ath10k_ahb_rst_ctrl_init(struct ath10k *ar)
         dev = &ar_ahb->pdev->dev;
 
         ar_ahb->core_cold_rst = devm_reset_control_get(dev, "wifi_core_cold");
-        if (IS_ERR_OR_NULL(ar_ahb->core_cold_rst)) {
+        if (IS_ERR(ar_ahb->core_cold_rst)) {
                 ath10k_err(ar, "failed to get core cold rst ctrl: %ld\n",
                            PTR_ERR(ar_ahb->core_cold_rst));
-                return ar_ahb->core_cold_rst ?
-                        PTR_ERR(ar_ahb->core_cold_rst) : -ENODEV;
+                return PTR_ERR(ar_ahb->core_cold_rst);
         }
 
         ar_ahb->radio_cold_rst = devm_reset_control_get(dev, "wifi_radio_cold");
-        if (IS_ERR_OR_NULL(ar_ahb->radio_cold_rst)) {
+        if (IS_ERR(ar_ahb->radio_cold_rst)) {
                 ath10k_err(ar, "failed to get radio cold rst ctrl: %ld\n",
                            PTR_ERR(ar_ahb->radio_cold_rst));
-                return ar_ahb->radio_cold_rst ?
-                        PTR_ERR(ar_ahb->radio_cold_rst) : -ENODEV;
+                return PTR_ERR(ar_ahb->radio_cold_rst);
         }
 
         ar_ahb->radio_warm_rst = devm_reset_control_get(dev, "wifi_radio_warm");
-        if (IS_ERR_OR_NULL(ar_ahb->radio_warm_rst)) {
+        if (IS_ERR(ar_ahb->radio_warm_rst)) {
                 ath10k_err(ar, "failed to get radio warm rst ctrl: %ld\n",
                            PTR_ERR(ar_ahb->radio_warm_rst));
-                return ar_ahb->radio_warm_rst ?
-                        PTR_ERR(ar_ahb->radio_warm_rst) : -ENODEV;
+                return PTR_ERR(ar_ahb->radio_warm_rst);
         }
 
         ar_ahb->radio_srif_rst = devm_reset_control_get(dev, "wifi_radio_srif");
-        if (IS_ERR_OR_NULL(ar_ahb->radio_srif_rst)) {
+        if (IS_ERR(ar_ahb->radio_srif_rst)) {
                 ath10k_err(ar, "failed to get radio srif rst ctrl: %ld\n",
                            PTR_ERR(ar_ahb->radio_srif_rst));
-                return ar_ahb->radio_srif_rst ?
-                        PTR_ERR(ar_ahb->radio_srif_rst) : -ENODEV;
+                return PTR_ERR(ar_ahb->radio_srif_rst);
         }
 
         ar_ahb->cpu_init_rst = devm_reset_control_get(dev, "wifi_cpu_init");
-        if (IS_ERR_OR_NULL(ar_ahb->cpu_init_rst)) {
+        if (IS_ERR(ar_ahb->cpu_init_rst)) {
                 ath10k_err(ar, "failed to get cpu init rst ctrl: %ld\n",
                            PTR_ERR(ar_ahb->cpu_init_rst));
-                return ar_ahb->cpu_init_rst ?
-                        PTR_ERR(ar_ahb->cpu_init_rst) : -ENODEV;
+                return PTR_ERR(ar_ahb->cpu_init_rst);
         }
 
         return 0;