Messages in this thread Patch in this message | | | From | Krzysztof Kozlowski <> | Subject | [PATCH 1/2] mfd: sec-core: Remove duplicated device type from sec_pmic | Date | Mon, 14 Apr 2014 14:03:34 +0200 |
| |
The device type was stored in sec_pmic state container twice: - unsigned long type - int device_type
The 'type' field was never used outside of probe so it can be safely removed.
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> --- drivers/mfd/sec-core.c | 5 +++-- include/linux/mfd/samsung/core.h | 1 - 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c index d4682c6cbff5..fccfd71f8abd 100644 --- a/drivers/mfd/sec-core.c +++ b/drivers/mfd/sec-core.c @@ -251,6 +251,7 @@ static int sec_pmic_probe(struct i2c_client *i2c, struct sec_platform_data *pdata = dev_get_platdata(&i2c->dev); const struct regmap_config *regmap; struct sec_pmic_dev *sec_pmic; + unsigned long device_type; int ret; sec_pmic = devm_kzalloc(&i2c->dev, sizeof(struct sec_pmic_dev), @@ -262,7 +263,7 @@ static int sec_pmic_probe(struct i2c_client *i2c, sec_pmic->dev = &i2c->dev; sec_pmic->i2c = i2c; sec_pmic->irq = i2c->irq; - sec_pmic->type = sec_i2c_get_driver_data(i2c, id); + device_type = sec_i2c_get_driver_data(i2c, id); if (sec_pmic->dev->of_node) { pdata = sec_pmic_i2c_parse_dt_pdata(sec_pmic->dev); @@ -270,7 +271,7 @@ static int sec_pmic_probe(struct i2c_client *i2c, ret = PTR_ERR(pdata); return ret; } - pdata->device_type = sec_pmic->type; + pdata->device_type = (int)device_type; } if (pdata) { sec_pmic->device_type = pdata->device_type; diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h index 84aaf6c25794..2633083262ea 100644 --- a/include/linux/mfd/samsung/core.h +++ b/include/linux/mfd/samsung/core.h @@ -49,7 +49,6 @@ struct sec_pmic_dev { struct regmap_irq_chip_data *irq_data; int ono; - unsigned long type; bool wakeup; bool wtsr_smpl; }; -- 1.8.3.2
| |