Commit fa9f7efe authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mathieu Poirier
Browse files

remoteproc: ti_k3_r5: Simplify with dev_err_probe() 



Use dev_err_probe() to make error and defer code handling simpler.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20241011-remote-proc-dev-err-probe-v1-3-5abb4fc61eca@linaro.org


Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
parent e1433706

drivers/remoteproc/ti_k3_r5_remoteproc.c

+24 −45
Original line number Diff line number Diff line
@@ -1557,11 +1557,7 @@ static int k3_r5_core_of_init(struct platform_device *pdev) 


	core->ti_sci = devm_ti_sci_get_by_phandle(dev, "ti,sci");

	if (IS_ERR(core->ti_sci)) {

		ret = PTR_ERR(core->ti_sci);

		if (ret != -EPROBE_DEFER) {

			dev_err(dev, "failed to get ti-sci handle, ret = %d\n",

				ret);

		}

		ret = dev_err_probe(dev, PTR_ERR(core->ti_sci), "failed to get ti-sci handle\n");

		core->ti_sci = NULL;

		goto err;

	}
@@ -1577,18 +1573,14 @@ static int k3_r5_core_of_init(struct platform_device *pdev) 
		ret = PTR_ERR_OR_ZERO(core->reset);

		if (!ret)

			ret = -ENODEV;

		if (ret != -EPROBE_DEFER) {

			dev_err(dev, "failed to get reset handle, ret = %d\n",

				ret);

		}

		dev_err_probe(dev, ret, "failed to get reset handle\n");

		goto err;

	}



	core->tsp = ti_sci_proc_of_get_tsp(dev, core->ti_sci);

	if (IS_ERR(core->tsp)) {

		ret = PTR_ERR(core->tsp);

		dev_err(dev, "failed to construct ti-sci proc control, ret = %d\n",

			ret);

		ret = dev_err_probe(dev, PTR_ERR(core->tsp),

				    "failed to construct ti-sci proc control\n");

		goto err;

	}
@@ -1717,11 +1709,8 @@ static int k3_r5_probe(struct platform_device *pdev) 
	init_waitqueue_head(&cluster->core_transition);



	ret = of_property_read_u32(np, "ti,cluster-mode", &cluster->mode);

	if (ret < 0 && ret != -EINVAL) {

		dev_err(dev, "invalid format for ti,cluster-mode, ret = %d\n",

			ret);

		return ret;

	}

	if (ret < 0 && ret != -EINVAL)

		return dev_err_probe(dev, ret, "invalid format for ti,cluster-mode\n");



	if (ret == -EINVAL) {

		/*
@@ -1740,49 +1729,39 @@ static int k3_r5_probe(struct platform_device *pdev) 
	}



	if  ((cluster->mode == CLUSTER_MODE_SINGLECPU && !data->single_cpu_mode) ||

	     (cluster->mode == CLUSTER_MODE_SINGLECORE && !data->is_single_core)) {

		dev_err(dev, "Cluster mode = %d is not supported on this SoC\n", cluster->mode);

		return -EINVAL;

	}

	     (cluster->mode == CLUSTER_MODE_SINGLECORE && !data->is_single_core))

		return dev_err_probe(dev, -EINVAL,

				     "Cluster mode = %d is not supported on this SoC\n",

				     cluster->mode);



	num_cores = of_get_available_child_count(np);

	if (num_cores != 2 && !data->is_single_core) {

		dev_err(dev, "MCU cluster requires both R5F cores to be enabled but num_cores is set to = %d\n",

	if (num_cores != 2 && !data->is_single_core)

		return dev_err_probe(dev, -ENODEV,

				     "MCU cluster requires both R5F cores to be enabled but num_cores is set to = %d\n",

				     num_cores);

		return -ENODEV;

	}



	if (num_cores != 1 && data->is_single_core) {

		dev_err(dev, "SoC supports only single core R5 but num_cores is set to %d\n",

	if (num_cores != 1 && data->is_single_core)

		return dev_err_probe(dev, -ENODEV,

				     "SoC supports only single core R5 but num_cores is set to %d\n",

				     num_cores);

		return -ENODEV;

	}



	platform_set_drvdata(pdev, cluster);



	ret = devm_of_platform_populate(dev);

	if (ret) {

		dev_err(dev, "devm_of_platform_populate failed, ret = %d\n",

			ret);

		return ret;

	}

	if (ret)

		return dev_err_probe(dev, ret, "devm_of_platform_populate failed\n");



	ret = k3_r5_cluster_of_init(pdev);

	if (ret) {

		dev_err(dev, "k3_r5_cluster_of_init failed, ret = %d\n", ret);

		return ret;

	}

	if (ret)

		return dev_err_probe(dev, ret, "k3_r5_cluster_of_init failed\n");



	ret = devm_add_action_or_reset(dev, k3_r5_cluster_of_exit, pdev);

	if (ret)

		return ret;



	ret = k3_r5_cluster_rproc_init(pdev);

	if (ret) {

		dev_err(dev, "k3_r5_cluster_rproc_init failed, ret = %d\n",

			ret);

		return ret;

	}

	if (ret)

		return dev_err_probe(dev, ret, "k3_r5_cluster_rproc_init failed\n");



	ret = devm_add_action_or_reset(dev, k3_r5_cluster_rproc_exit, pdev);

	if (ret)