pinctrl: sh-pfc: sh73a0: Remove unnecessary SoC data allocation

The SoC data structure allocated at init time only holds a regulator
pointer that is only used in the init function. Replace it with a local
variable and get rid of the SoC data structure allocation altogether.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

4 files changed, 5 insertions, 26 deletions

diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/sh-pfc/core.c
index b9b464d0578c..6572c233f73d 100644
--- a/drivers/pinctrl/sh-pfc/core.c
+++ b/drivers/pinctrl/sh-pfc/core.c
@@ -542,7 +542,7 @@ static int sh_pfc_probe(struct platform_device *pdev)
          */
         ret = sh_pfc_register_pinctrl(pfc);
         if (unlikely(ret != 0))
-                goto error;
+                return ret;
 
 #ifdef CONFIG_GPIO_SH_PFC
         /*
@@ -564,11 +564,6 @@ static int sh_pfc_probe(struct platform_device *pdev)
         dev_info(pfc->dev, "%s support registered\n", info->name);
 
         return 0;
-
-error:
-        if (info->ops && info->ops->exit)
-                info->ops->exit(pfc);
-        return ret;
 }
 
 static int sh_pfc_remove(struct platform_device *pdev)
@@ -580,9 +575,6 @@ static int sh_pfc_remove(struct platform_device *pdev)
 #endif
         sh_pfc_unregister_pinctrl(pfc);
 
-        if (pfc->info->ops && pfc->info->ops->exit)
-                pfc->info->ops->exit(pfc);
-
         return 0;
 }
 
diff --git a/drivers/pinctrl/sh-pfc/core.h b/drivers/pinctrl/sh-pfc/core.h
index b7b0e6ccf305..3daaa5241c47 100644
--- a/drivers/pinctrl/sh-pfc/core.h
+++ b/drivers/pinctrl/sh-pfc/core.h
@@ -33,7 +33,6 @@ struct sh_pfc_pin_range {
 struct sh_pfc {
         struct device *dev;
         const struct sh_pfc_soc_info *info;
-        void *soc_data;
         spinlock_t lock;
 
         unsigned int num_windows;
diff --git a/drivers/pinctrl/sh-pfc/pfc-sh73a0.c b/drivers/pinctrl/sh-pfc/pfc-sh73a0.c
index 2dd8fd524a80..d2efbfb776ac 100644
--- a/drivers/pinctrl/sh-pfc/pfc-sh73a0.c
+++ b/drivers/pinctrl/sh-pfc/pfc-sh73a0.c
@@ -3824,35 +3824,24 @@ static void sh73a0_pinmux_set_bias(struct sh_pfc *pfc, unsigned int pin,
  * SoC information
  */
 
-struct sh73a0_pinmux_data {
-        struct regulator_dev *vccq_mc0;
-};
-
 static int sh73a0_pinmux_soc_init(struct sh_pfc *pfc)
 {
-        struct sh73a0_pinmux_data *data;
         struct regulator_config cfg = { };
+        struct regulator_dev *vccq;
         int ret;
 
-        data = devm_kzalloc(pfc->dev, sizeof(*data), GFP_KERNEL);
-        if (data == NULL)
-                return -ENOMEM;
-
         cfg.dev = pfc->dev;
         cfg.init_data = &sh73a0_vccq_mc0_init_data;
         cfg.driver_data = pfc;
 
-        data->vccq_mc0 = devm_regulator_register(pfc->dev,
-                                                 &sh73a0_vccq_mc0_desc, &cfg);
-        if (IS_ERR(data->vccq_mc0)) {
-                ret = PTR_ERR(data->vccq_mc0);
+        vccq = devm_regulator_register(pfc->dev, &sh73a0_vccq_mc0_desc, &cfg);
+        if (IS_ERR(vccq)) {
+                ret = PTR_ERR(vccq);
                 dev_err(pfc->dev, "Failed to register VCCQ MC0 regulator: %d\n",
                         ret);
                 return ret;
         }
 
-        pfc->soc_data = data;
-
         return 0;
 }
 
diff --git a/drivers/pinctrl/sh-pfc/sh_pfc.h b/drivers/pinctrl/sh-pfc/sh_pfc.h
index d482c40b012a..5b7283182c1e 100644
--- a/drivers/pinctrl/sh-pfc/sh_pfc.h
+++ b/drivers/pinctrl/sh-pfc/sh_pfc.h
@@ -116,7 +116,6 @@ struct sh_pfc;
 
 struct sh_pfc_soc_operations {
         int (*init)(struct sh_pfc *pfc);
-        void (*exit)(struct sh_pfc *pfc);
         unsigned int (*get_bias)(struct sh_pfc *pfc, unsigned int pin);
         void (*set_bias)(struct sh_pfc *pfc, unsigned int pin,
                          unsigned int bias);