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

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

Merge "soc: qcom: pil: Print out the return value in the error path" into msm-next

parents 57cae5f3 2d921663

drivers/soc/qcom/subsys-pil-tz.c

+10 −6
Original line number Original line Diff line number Diff line
@@ -381,28 +381,29 @@ static int piltz_resc_init(struct platform_device *pdev, struct pil_tz_data *d) 




	count = of_read_clocks(dev, &d->clks, "qcom,active-clock-names");

	count = of_read_clocks(dev, &d->clks, "qcom,active-clock-names");

	if (count < 0) {

	if (count < 0) {

		dev_err(dev, "Failed to setup clocks.\n");

		dev_err(dev, "Failed to setup clocks(rc:%d).\n", count);

		return count;

		return count;

	}

	}

	d->clk_count = count;

	d->clk_count = count;





	count = of_read_clocks(dev, &d->proxy_clks, "qcom,proxy-clock-names");

	count = of_read_clocks(dev, &d->proxy_clks, "qcom,proxy-clock-names");

	if (count < 0) {

	if (count < 0) {

		dev_err(dev, "Failed to setup proxy clocks.\n");

		dev_err(dev, "Failed to setup proxy clocks(rc:%d).\n", count);

		return count;

		return count;

	}

	}

	d->proxy_clk_count = count;

	d->proxy_clk_count = count;





	count = of_read_regs(dev, &d->regs, "qcom,active-reg-names");

	count = of_read_regs(dev, &d->regs, "qcom,active-reg-names");

	if (count < 0) {

	if (count < 0) {

		dev_err(dev, "Failed to setup regulators.\n");

		dev_err(dev, "Failed to setup regulators(rc:%d).\n", count);

		return count;

		return count;

	}

	}

	d->reg_count = count;

	d->reg_count = count;





	count = of_read_regs(dev, &d->proxy_regs, "qcom,proxy-reg-names");

	count = of_read_regs(dev, &d->proxy_regs, "qcom,proxy-reg-names");

	if (count < 0) {

	if (count < 0) {

		dev_err(dev, "Failed to setup proxy regulators.\n");

		dev_err(dev, "Failed to setup proxy regulators(rc:%d).\n",

				count);

		return count;

		return count;

	}

	}

	d->proxy_reg_count = count;

	d->proxy_reg_count = count;
@@ -411,7 +412,8 @@ static int piltz_resc_init(struct platform_device *pdev, struct pil_tz_data *d) 
		d->enable_bus_scaling = true;

		d->enable_bus_scaling = true;

		rc = of_read_bus_pdata(pdev, d);

		rc = of_read_bus_pdata(pdev, d);

		if (rc) {

		if (rc) {

			dev_err(dev, "Failed to setup bus scaling client.\n");

			dev_err(dev, "Failed to setup bus scaling client(rc:%d).\n",

				rc);

			return rc;

			return rc;

		}

		}

	}

	}
@@ -1120,7 +1122,9 @@ static int pil_tz_driver_probe(struct platform_device *pdev) 
		       "qcom,spss-scsr-bits", d->bits_arr, sizeof(d->bits_arr)/

		       "qcom,spss-scsr-bits", d->bits_arr, sizeof(d->bits_arr)/

							sizeof(d->bits_arr[0]));

							sizeof(d->bits_arr[0]));

		if (rc)

		if (rc)

			dev_err(&pdev->dev, "Failed to read qcom,spss-scsr-bits");

			dev_err(&pdev->dev,

				"Failed to read qcom,spss-scsr-bits(rc:%d)",

				rc);

		mask_scsr_irqs(d);

		mask_scsr_irqs(d);





	} else {

	} else {