The 'device_type' field of platform data structure is not used and can
be safely dropped.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlow...@canonical.com>
---
 drivers/mfd/sec-core.c           | 5 +----
 include/linux/mfd/samsung/core.h | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
index 653d02b98d53..4c4db3171ce6 100644
--- a/drivers/mfd/sec-core.c
+++ b/drivers/mfd/sec-core.c
@@ -318,7 +318,6 @@ static int sec_pmic_probe(struct i2c_client *i2c,
        struct sec_platform_data *pdata;
        const struct mfd_cell *sec_devs;
        struct sec_pmic_dev *sec_pmic;
-       unsigned long device_type;
        int ret, num_sec_devs;
 
        sec_pmic = devm_kzalloc(&i2c->dev, sizeof(struct sec_pmic_dev),
@@ -330,16 +329,14 @@ static int sec_pmic_probe(struct i2c_client *i2c,
        sec_pmic->dev = &i2c->dev;
        sec_pmic->i2c = i2c;
        sec_pmic->irq = i2c->irq;
-       device_type = (unsigned long)of_device_get_match_data(sec_pmic->dev);
 
        pdata = sec_pmic_i2c_parse_dt_pdata(sec_pmic->dev);
        if (IS_ERR(pdata)) {
                ret = PTR_ERR(pdata);
                return ret;
        }
-       pdata->device_type = device_type;
 
-       sec_pmic->device_type = pdata->device_type;
+       sec_pmic->device_type = (unsigned 
long)of_device_get_match_data(sec_pmic->dev);
        sec_pmic->irq_base = pdata->irq_base;
        sec_pmic->wakeup = pdata->wakeup;
        sec_pmic->pdata = pdata;
diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h
index 68afc2b97a41..bfde1b7c6303 100644
--- a/include/linux/mfd/samsung/core.h
+++ b/include/linux/mfd/samsung/core.h
@@ -81,7 +81,6 @@ int sec_irq_resume(struct sec_pmic_dev *sec_pmic);
 struct sec_platform_data {
        struct sec_regulator_data       *regulators;
        struct sec_opmode_data          *opmode;
-       int                             device_type;
        int                             num_regulators;
 
        int                             irq_base;
-- 
2.25.1

Reply via email to