|
|
@@ -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;
|