Commit 6a5e7aaf authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Greg Kroah-Hartman
Browse files

staging: hikey9xx: hi6421v600-regulator: do some cleanups 



In preparation for de-staging, do some cleanups:

- Return error codes from hi6421_spmi_pmic_rmw();
- Remove a debug message;
- Change the module description;
- a few minor coding style adjustments.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Link: https://lore.kernel.org/r/0bae0c05d997e4a5a0b3b86a65f3370dafb14596.1611212783.git.mchehab+huawei@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6436a125

drivers/staging/hikey9xx/hi6421v600-regulator.c

+15 −22
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ static int hi6421_spmi_regulator_enable(struct regulator_dev *rdev) 
{

	struct hi6421_spmi_reg_info *sreg = rdev_get_drvdata(rdev);

	struct hi6421_spmi_pmic *pmic = sreg->pmic;

	int ret;



	/* cannot enable more than one regulator at one time */

	mutex_lock(&sreg->enable_mutex);
@@ -124,13 +125,13 @@ static int hi6421_spmi_regulator_enable(struct regulator_dev *rdev) 
		     HISI_REGS_ENA_PROTECT_TIME + 1000);



	/* set enable register */

	hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg,

	ret = hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg,

				   rdev->desc->enable_mask,

				   rdev->desc->enable_mask);



	mutex_unlock(&sreg->enable_mutex);



	return 0;

	return ret;

}



static int hi6421_spmi_regulator_disable(struct regulator_dev *rdev)
@@ -139,10 +140,8 @@ static int hi6421_spmi_regulator_disable(struct regulator_dev *rdev) 
	struct hi6421_spmi_pmic *pmic = sreg->pmic;



	/* set enable register to 0 */

	hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg,

	return hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg,

				    rdev->desc->enable_mask, 0);



	return 0;

}



static int hi6421_spmi_regulator_get_voltage_sel(struct regulator_dev *rdev)
@@ -164,16 +163,14 @@ static int hi6421_spmi_regulator_set_voltage_sel(struct regulator_dev *rdev, 
	struct hi6421_spmi_pmic *pmic = sreg->pmic;

	u32 reg_val;



	if (unlikely(selector >= rdev->desc->n_voltages))

	if (selector >= rdev->desc->n_voltages)

		return -EINVAL;



	reg_val = selector << (ffs(rdev->desc->vsel_mask) - 1);



	/* set voltage selector */

	hi6421_spmi_pmic_rmw(pmic, rdev->desc->vsel_reg,

	return hi6421_spmi_pmic_rmw(pmic, rdev->desc->vsel_reg,

				    rdev->desc->vsel_mask, reg_val);



	return 0;

}



static unsigned int hi6421_spmi_regulator_get_mode(struct regulator_dev *rdev)
@@ -209,10 +206,8 @@ static int hi6421_spmi_regulator_set_mode(struct regulator_dev *rdev, 
	}



	/* set mode */

	hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg,

	return hi6421_spmi_pmic_rmw(pmic, rdev->desc->enable_reg,

				    sreg->eco_mode_mask, val);



	return 0;

}



static unsigned int
@@ -319,8 +314,6 @@ static int hi6421_spmi_regulator_probe(struct platform_device *pdev) 
		/* assign per-regulator data */

		info = &regulator_info[i];



		dev_dbg(dev, "adding regulator %s\n", info->desc.name);



		config.dev = pdev->dev.parent;

		config.driver_data = sreg;
@@ -350,6 +343,6 @@ static struct platform_driver hi6421_spmi_regulator_driver = { 
};

module_platform_driver(hi6421_spmi_regulator_driver);



MODULE_DESCRIPTION("Hi6421v600 regulator driver");

MODULE_DESCRIPTION("Hi6421v600 SPMI regulator driver");

MODULE_LICENSE("GPL v2");