Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65901a9e authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Kalle Valo
Browse files

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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent c5d8a346

drivers/net/wireless/ath/ath10k/ahb.c

+10 −15
Original line number Diff line number Diff line
@@ -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;