From 51876911842f64489b84bb86a86a50f961069a78 Mon Sep 17 00:00:00 2001 From: Joseph Chen Date: Fri, 1 Nov 2019 17:53:09 +0800 Subject: [PATCH] mfd: rk808: remove duplicate content Change-Id: Ie2de3186579213c565c3b38a2c68955f2a7fd227 Signed-off-by: Joseph Chen --- drivers/mfd/rk808.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c index f57d8f52c22e..213a642869d5 100644 --- a/drivers/mfd/rk808.c +++ b/drivers/mfd/rk808.c @@ -1190,6 +1190,7 @@ static int rk808_probe(struct i2c_client *client, } rk808->i2c = client; + rk808_i2c_client = client; i2c_set_clientdata(client, rk808); rk808->regmap = devm_regmap_init_i2c(client, rk808->regmap_cfg); @@ -1223,10 +1224,6 @@ static int rk808_probe(struct i2c_client *client, if (of_property_prepare_fn) of_property_prepare_fn(rk808, &client->dev); - i2c_set_clientdata(client, rk808); - rk808->i2c = client; - rk808_i2c_client = client; - for (i = 0; i < nr_pre_init_regs; i++) { ret = regmap_update_bits(rk808->regmap, pre_init_reg[i].addr, @@ -1275,10 +1272,8 @@ static int rk808_probe(struct i2c_client *client, goto err_irq; } - if (of_property_read_bool(np, "rockchip,system-power-controller")) { - rk808_i2c_client = client; + if (of_property_read_bool(np, "rockchip,system-power-controller")) pm_power_off = rk808_pm_power_off; - } rk8xx_kobj = kobject_create_and_add("rk8xx", NULL); if (rk8xx_kobj) {