Commit 01170383 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown
Browse files

regulator: s2mps11: Move DTS parsing code to separate function 



Refactor code for parsing DTS to increase a little code readability. The
behaviour should not change.

Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent c9eaa447

drivers/regulator/s2mps11.c

+23 −12
Original line number Diff line number Diff line
@@ -565,12 +565,28 @@ static const struct regulator_desc s2mps14_regulators[] = { 
	regulator_desc_s2mps14_buck1235(5),

};



static int s2mps11_pmic_dt_parse(struct platform_device *pdev,

		struct of_regulator_match *rdata, struct s2mps11_info *s2mps11)

{

	struct device_node *reg_np;



	reg_np = of_get_child_by_name(pdev->dev.parent->of_node, "regulators");

	if (!reg_np) {

		dev_err(&pdev->dev, "could not find regulators sub-node\n");

		return -EINVAL;

	}



	of_regulator_match(&pdev->dev, reg_np, rdata, s2mps11->rdev_num);

	of_node_put(reg_np);



	return 0;

}



static int s2mps11_pmic_probe(struct platform_device *pdev)

{

	struct sec_pmic_dev *iodev = dev_get_drvdata(pdev->dev.parent);

	struct sec_platform_data *pdata = iodev->pdata;

	struct sec_platform_data *pdata = NULL;

	struct of_regulator_match *rdata = NULL;

	struct device_node *reg_np = NULL;

	struct regulator_config config = { };

	struct s2mps11_info *s2mps11;

	int i, ret = 0;
@@ -598,7 +614,8 @@ static int s2mps11_pmic_probe(struct platform_device *pdev) 
	};



	if (!iodev->dev->of_node) {

		if (pdata) {

		if (iodev->pdata) {

			pdata = iodev->pdata;

			goto common_reg;

		} else {

			dev_err(pdev->dev.parent,
@@ -614,15 +631,9 @@ static int s2mps11_pmic_probe(struct platform_device *pdev) 
	for (i = 0; i < s2mps11->rdev_num; i++)

		rdata[i].name = regulators[i].name;



	reg_np = of_get_child_by_name(iodev->dev->of_node, "regulators");

	if (!reg_np) {

		dev_err(&pdev->dev, "could not find regulators sub-node\n");

		ret = -EINVAL;

	ret = s2mps11_pmic_dt_parse(pdev, rdata, s2mps11);

	if (ret)

		goto out;

	}



	of_regulator_match(&pdev->dev, reg_np, rdata, s2mps11->rdev_num);

	of_node_put(reg_np);



common_reg:

	platform_set_drvdata(pdev, s2mps11);
@@ -633,7 +644,7 @@ static int s2mps11_pmic_probe(struct platform_device *pdev) 
	for (i = 0; i < s2mps11->rdev_num; i++) {

		struct regulator_dev *regulator;



		if (!reg_np) {

		if (pdata) {

			config.init_data = pdata->regulators[i].initdata;

			config.of_node = pdata->regulators[i].reg_node;

		} else {