mfd: da9063: Remove platform_data support

There are no in-kernel users anymore, so remove this outdated interface.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Steve Twiss <stwiss.opensource@diasemi.com>
Tested-by: Steve Twiss <stwiss.opensource@diasemi.com>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/mfd/da9063-core.c b/drivers/mfd/da9063-core.c
index 4e5ebb7..b125f90 100644 (file)
--- a/drivers/mfd/da9063-core.c
+++ b/drivers/mfd/da9063-core.c
@@ -22,7 +22,6 @@
 #include <linux/regmap.h>
 
 #include <linux/mfd/da9063/core.h>
-#include <linux/mfd/da9063/pdata.h>
 #include <linux/mfd/da9063/registers.h>
 
 #include <linux/proc_fs.h>
@@ -161,7 +160,6 @@ static int da9063_clear_fault_log(struct da9063 *da9063)
 
 int da9063_device_init(struct da9063 *da9063, unsigned int irq)
 {
-       struct da9063_pdata *pdata = da9063->dev->platform_data;
        int model, variant_id, variant_code;
        int ret;
 
@@ -169,24 +167,10 @@ int da9063_device_init(struct da9063 *da9063, unsigned int irq)
        if (ret < 0)
                dev_err(da9063->dev, "Cannot clear fault log\n");
 
-       if (pdata) {
-               da9063->flags = pdata->flags;
-               da9063->irq_base = pdata->irq_base;
-       } else {
-               da9063->flags = 0;
-               da9063->irq_base = -1;
-       }
+       da9063->flags = 0;
+       da9063->irq_base = -1;
        da9063->chip_irq = irq;
 
-       if (pdata && pdata->init != NULL) {
-               ret = pdata->init(da9063);
-               if (ret != 0) {
-                       dev_err(da9063->dev,
-                               "Platform initialization failed.\n");
-                       return ret;
-               }
-       }
-
        ret = regmap_read(da9063->regmap, DA9063_REG_CHIP_ID, &model);
        if (ret < 0) {
                dev_err(da9063->dev, "Cannot read chip model id.\n");

diff --git a/drivers/mfd/da9063-i2c.c b/drivers/mfd/da9063-i2c.c
index 4a97ba0..455de74 100644 (file)
--- a/drivers/mfd/da9063-i2c.c
+++ b/drivers/mfd/da9063-i2c.c
@@ -17,7 +17,6 @@
 
 #include <linux/mfd/core.h>
 #include <linux/mfd/da9063/core.h>
-#include <linux/mfd/da9063/pdata.h>
 #include <linux/mfd/da9063/registers.h>
 
 #include <linux/of.h>

diff --git a/drivers/mfd/da9063-irq.c b/drivers/mfd/da9063-irq.c
index e12b3dd..e2bbedf 100644 (file)
--- a/drivers/mfd/da9063-irq.c
+++ b/drivers/mfd/da9063-irq.c
@@ -14,7 +14,6 @@
 #include <linux/interrupt.h>
 #include <linux/regmap.h>
 #include <linux/mfd/da9063/core.h>
-#include <linux/mfd/da9063/pdata.h>
 
 #define        DA9063_REG_EVENT_A_OFFSET       0
 #define        DA9063_REG_EVENT_B_OFFSET       1