mfd: sec-core: Remove duplicated device type from sec_pmic_dev

The device type was stored in sec_pmic_dev state container twice:
 - unsigned long type (initialized from of_device_id or i2c_device_id)
 - int device_type (initialized as above or from board files when there
   is no DTS)

The 'type' field was never used outside of probe so it can be safely
removed.

Change also the device_type in sec_pmic_dev and sec_platform_data to
unsigned long to avoid any casts.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
index d4682c6cbff53ac9331ef7565ee15abd97a3f947..09fd256abcf604d5367fdff248279ef42b6c0520 100644 (file)
--- 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 = device_type;
        }
        if (pdata) {
                sec_pmic->device_type = pdata->device_type;

diff --git a/drivers/mfd/sec-irq.c b/drivers/mfd/sec-irq.c
index 64e7913aadc6cf3fbe68389edd8ba986e7a1ec8c..654e2c1dbf7a61cc9884ed78f3006d2bf332f1be 100644 (file)
--- a/drivers/mfd/sec-irq.c
+++ b/drivers/mfd/sec-irq.c
@@ -385,7 +385,7 @@ int sec_irq_init(struct sec_pmic_dev *sec_pmic)
                                  &sec_pmic->irq_data);
                break;
        default:
-               dev_err(sec_pmic->dev, "Unknown device type %d\n",
+               dev_err(sec_pmic->dev, "Unknown device type %lu\n",
                        sec_pmic->device_type);
                return -EINVAL;
        }

diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h
index 1c66a6462887282509c6b02a189091ed4cd31802..47d84242940bb7057e15f23ac27666aea41aec71 100644 (file)
--- a/include/linux/mfd/samsung/core.h
+++ b/include/linux/mfd/samsung/core.h
@@ -48,13 +48,12 @@ struct sec_pmic_dev {
        struct regmap *regmap_pmic;
        struct i2c_client *i2c;
 
-       int device_type;
+       unsigned long device_type;
        int irq_base;
        int irq;
        struct regmap_irq_chip_data *irq_data;
 
        int ono;
-       unsigned long type;
        bool wakeup;
        bool wtsr_smpl;
 };