Re: [PATCH 3/6] mfd: da9063: remove platform_data support
From: Simon Horman
Date: Tue Mar 19 2019 - 08:49:37 EST
On Mon, Mar 18, 2019 at 04:47:55PM +0100, Wolfram Sang wrote:
> There are no in-kernel users anymore, so remove this outdated interface.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@xxxxxxxxxxxxxxxxxxxx>
Reviewed-by: Simon Horman <horms+renesas@xxxxxxxxxxxx>
> ---
> drivers/mfd/da9063-core.c | 20 ++------------------
> drivers/mfd/da9063-i2c.c | 1 -
> drivers/mfd/da9063-irq.c | 1 -
> 3 files changed, 2 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/mfd/da9063-core.c b/drivers/mfd/da9063-core.c
> index 6e4ce49b4405..65ca288b0c90 100644
> --- a/drivers/mfd/da9063-core.c
> +++ b/drivers/mfd/da9063-core.c
> @@ -26,7 +26,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>
> @@ -165,7 +164,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;
>
> @@ -173,24 +171,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 50a24b1921d0..5f707b100e69 100644
> --- a/drivers/mfd/da9063-i2c.c
> +++ b/drivers/mfd/da9063-i2c.c
> @@ -22,7 +22,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 ecc0c8ce6c58..ac02c31c5802 100644
> --- a/drivers/mfd/da9063-irq.c
> +++ b/drivers/mfd/da9063-irq.c
> @@ -19,7 +19,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
> --
> 2.11.0
>