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

Commit 165ca372 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "wcnss: Use devm_ioremap_resource()"

parents 48a4b550 ad838434

drivers/net/wireless/wcnss/wcnss_wlan.c

+12 −12
Original line number Diff line number Diff line
@@ -2916,7 +2916,7 @@ wcnss_trigger_config(struct platform_device *pdev) 
			goto fail_ioremap;

		}

		penv->msm_wcnss_base =

			devm_request_and_ioremap(&pdev->dev, res);

			devm_ioremap_resource(&pdev->dev, res);

	} else {

		res = platform_get_resource_byname(pdev,

			IORESOURCE_MEM, "riva_phy_base");
@@ -2927,7 +2927,7 @@ wcnss_trigger_config(struct platform_device *pdev) 
			goto fail_ioremap;

		}

		penv->msm_wcnss_base =

			devm_request_and_ioremap(&pdev->dev, res);

			devm_ioremap_resource(&pdev->dev, res);

	}



	if (!penv->msm_wcnss_base) {
@@ -2947,7 +2947,7 @@ wcnss_trigger_config(struct platform_device *pdev) 
			goto fail_ioremap;

		}

		penv->riva_ccu_base =

			devm_request_and_ioremap(&pdev->dev, res);

			devm_ioremap_resource(&pdev->dev, res);



		if (!penv->riva_ccu_base) {

			ret = -ENOMEM;
@@ -2965,7 +2965,7 @@ wcnss_trigger_config(struct platform_device *pdev) 
			goto fail_ioremap;

		}

		penv->pronto_a2xb_base =

			devm_request_and_ioremap(&pdev->dev, res);

			devm_ioremap_resource(&pdev->dev, res);



		if (!penv->pronto_a2xb_base) {

			ret = -ENOMEM;
@@ -2983,7 +2983,7 @@ wcnss_trigger_config(struct platform_device *pdev) 
			goto fail_ioremap;

		}

		penv->pronto_ccpu_base =

			devm_request_and_ioremap(&pdev->dev, res);

			devm_ioremap_resource(&pdev->dev, res);



		if (!penv->pronto_ccpu_base) {

			ret = -ENOMEM;
@@ -3017,7 +3017,7 @@ wcnss_trigger_config(struct platform_device *pdev) 
			goto fail_ioremap2;

		}

		penv->pronto_saw2_base =

			devm_request_and_ioremap(&pdev->dev, res);

			devm_ioremap_resource(&pdev->dev, res);



		if (!penv->pronto_saw2_base) {

			pr_err("%s: ioremap wcnss physical(saw2) failed\n",
@@ -3044,7 +3044,7 @@ wcnss_trigger_config(struct platform_device *pdev) 
			goto fail_ioremap2;

		}

		penv->wlan_tx_phy_aborts =

			devm_request_and_ioremap(&pdev->dev, res);

			devm_ioremap_resource(&pdev->dev, res);



		if (!penv->wlan_tx_phy_aborts) {

			ret = -ENOMEM;
@@ -3061,7 +3061,7 @@ wcnss_trigger_config(struct platform_device *pdev) 
			goto fail_ioremap2;

		}

		penv->wlan_brdg_err_source =

			devm_request_and_ioremap(&pdev->dev, res);

			devm_ioremap_resource(&pdev->dev, res);



		if (!penv->wlan_brdg_err_source) {

			ret = -ENOMEM;
@@ -3078,7 +3078,7 @@ wcnss_trigger_config(struct platform_device *pdev) 
			goto fail_ioremap2;

		}

		penv->wlan_tx_status =

			devm_request_and_ioremap(&pdev->dev, res);

			devm_ioremap_resource(&pdev->dev, res);



		if (!penv->wlan_tx_status) {

			ret = -ENOMEM;
@@ -3095,7 +3095,7 @@ wcnss_trigger_config(struct platform_device *pdev) 
			goto fail_ioremap2;

		}

		penv->alarms_txctl =

			devm_request_and_ioremap(&pdev->dev, res);

			devm_ioremap_resource(&pdev->dev, res);



		if (!penv->alarms_txctl) {

			ret = -ENOMEM;
@@ -3112,7 +3112,7 @@ wcnss_trigger_config(struct platform_device *pdev) 
			goto fail_ioremap2;

		}

		penv->alarms_tactl =

			devm_request_and_ioremap(&pdev->dev, res);

			devm_ioremap_resource(&pdev->dev, res);



		if (!penv->alarms_tactl) {

			ret = -ENOMEM;
@@ -3129,7 +3129,7 @@ wcnss_trigger_config(struct platform_device *pdev) 
			goto fail_ioremap2;

		}

		penv->pronto_mcu_base =

			devm_request_and_ioremap(&pdev->dev, res);

			devm_ioremap_resource(&pdev->dev, res);



		if (!penv->pronto_mcu_base) {

			ret = -ENOMEM;