[PATCH v5 1/2] mfd: rk808: Refactor shutdown functions

From: Daniel Schultz
Date: Thu Mar 29 2018 - 10:50:07 EST


Since all three shutdown functions have almost the same code, all logic
from the shutdown functions can be refactored to a new function
"rk808_update_bits", which can update a register by a given address and
bitmask.

Signed-off-by: Daniel Schultz <d.schultz@xxxxxxxxx>
---
Changes:
v2: Re-submit with recipients from Rockchip.
v3: - Added devicetree property to enable the PMIC reset seperate from
"rockchip,system-power-controller".
- Dropped the first patch of this serie.
v4: Splitted refactoring and the new reset feature.
v5: Removed null pointer from rk808_update_bits.

drivers/mfd/rk808.c | 46 +++++++++++++---------------------------------
1 file changed, 13 insertions(+), 33 deletions(-)

diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
index 216fbf6..1cb1b3a 100644
--- a/drivers/mfd/rk808.c
+++ b/drivers/mfd/rk808.c
@@ -369,58 +369,38 @@ static const struct regmap_irq_chip rk818_irq_chip = {

static struct i2c_client *rk808_i2c_client;

-static void rk805_device_shutdown(void)
+static void rk808_update_bits(unsigned int reg, unsigned int bit_mask)
{
int ret;
struct rk808 *rk808 = i2c_get_clientdata(rk808_i2c_client);

if (!rk808) {
dev_warn(&rk808_i2c_client->dev,
- "have no rk805, so do nothing here\n");
+ "have no rk805/rk808/rk818, so do nothing here\n");
return;
}

ret = regmap_update_bits(rk808->regmap,
- RK805_DEV_CTRL_REG,
- DEV_OFF, DEV_OFF);
+ reg,
+ bit_mask, bit_mask);
if (ret)
- dev_err(&rk808_i2c_client->dev, "power off error!\n");
+ dev_err(&rk808_i2c_client->dev,
+ "can't write to register 0x%x: %x!\n", reg, ret);
}

-static void rk808_device_shutdown(void)
+static void rk805_device_shutdown(void)
{
- int ret;
- struct rk808 *rk808 = i2c_get_clientdata(rk808_i2c_client);
-
- if (!rk808) {
- dev_warn(&rk808_i2c_client->dev,
- "have no rk808, so do nothing here\n");
- return;
- }
+ rk808_update_bits(RK805_DEV_CTRL_REG, DEV_OFF);
+}

- ret = regmap_update_bits(rk808->regmap,
- RK808_DEVCTRL_REG,
- DEV_OFF_RST, DEV_OFF_RST);
- if (ret)
- dev_err(&rk808_i2c_client->dev, "power off error!\n");
+static void rk808_device_shutdown(void)
+{
+ rk808_update_bits(RK808_DEVCTRL_REG, DEV_OFF_RST);
}

static void rk818_device_shutdown(void)
{
- int ret;
- struct rk808 *rk808 = i2c_get_clientdata(rk808_i2c_client);
-
- if (!rk808) {
- dev_warn(&rk808_i2c_client->dev,
- "have no rk818, so do nothing here\n");
- return;
- }
-
- ret = regmap_update_bits(rk808->regmap,
- RK818_DEVCTRL_REG,
- DEV_OFF, DEV_OFF);
- if (ret)
- dev_err(&rk808_i2c_client->dev, "power off error!\n");
+ rk808_update_bits(RK818_DEVCTRL_REG, DEV_OFF);
}

static const struct of_device_id rk808_of_match[] = {
--
2.7.4