[v1] clk: davinci: remove platform data struct

[PATCH] clk: davinci: remove platform data struct

Posted by Bartosz Golaszewski 1 year ago

From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

There are no board files using struct davinci_pll_platform_data anymore.
The structure itself is currently used to store a single pointer. Let's
remove the struct definition, the header and rework the driver to not
require the syscon regmap to be stored in probe().

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
---
 drivers/clk/davinci/pll.c                     | 33 +++----------------
 include/linux/platform_data/clk-davinci-pll.h | 21 ------------
 2 files changed, 4 insertions(+), 50 deletions(-)
 delete mode 100644 include/linux/platform_data/clk-davinci-pll.h

diff --git a/drivers/clk/davinci/pll.c b/drivers/clk/davinci/pll.c
index 5bbbb3a66477..b284da602f8d 100644
--- a/drivers/clk/davinci/pll.c
+++ b/drivers/clk/davinci/pll.c
@@ -19,7 +19,6 @@
 #include <linux/mfd/syscon.h>
 #include <linux/notifier.h>
 #include <linux/of.h>
-#include <linux/platform_data/clk-davinci-pll.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
 #include <linux/regmap.h>
@@ -840,27 +839,6 @@ int of_davinci_pll_init(struct device *dev, struct device_node *node,
 	return 0;
 }
 
-static struct davinci_pll_platform_data *davinci_pll_get_pdata(struct device *dev)
-{
-	struct davinci_pll_platform_data *pdata = dev_get_platdata(dev);
-
-	/*
-	 * Platform data is optional, so allocate a new struct if one was not
-	 * provided. For device tree, this will always be the case.
-	 */
-	if (!pdata)
-		pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
-	if (!pdata)
-		return NULL;
-
-	/* for device tree, we need to fill in the struct */
-	if (dev->of_node)
-		pdata->cfgchip =
-			syscon_regmap_lookup_by_compatible("ti,da830-cfgchip");
-
-	return pdata;
-}
-
 /* needed in early boot for clocksource/clockevent */
 #ifdef CONFIG_ARCH_DAVINCI_DA850
 CLK_OF_DECLARE(da850_pll0, "ti,da850-pll0", of_da850_pll0_init);
@@ -890,8 +868,8 @@ typedef int (*davinci_pll_init)(struct device *dev, void __iomem *base,
 static int davinci_pll_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
-	struct davinci_pll_platform_data *pdata;
 	davinci_pll_init pll_init = NULL;
+	struct regmap *cfgchip;
 	void __iomem *base;
 
 	pll_init = device_get_match_data(dev);
@@ -903,17 +881,14 @@ static int davinci_pll_probe(struct platform_device *pdev)
 		return -EINVAL;
 	}
 
-	pdata = davinci_pll_get_pdata(dev);
-	if (!pdata) {
-		dev_err(dev, "missing platform data\n");
-		return -EINVAL;
-	}
+	if (dev->of_node)
+		cfgchip = syscon_regmap_lookup_by_compatible("ti,da830-cfgchip");
 
 	base = devm_platform_ioremap_resource(pdev, 0);
 	if (IS_ERR(base))
 		return PTR_ERR(base);
 
-	return pll_init(dev, base, pdata->cfgchip);
+	return pll_init(dev, base, cfgchip);
 }
 
 static struct platform_driver davinci_pll_driver = {
diff --git a/include/linux/platform_data/clk-davinci-pll.h b/include/linux/platform_data/clk-davinci-pll.h
deleted file mode 100644
index e55dab1d578b..000000000000
--- a/include/linux/platform_data/clk-davinci-pll.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * PLL clock driver for TI Davinci SoCs
- *
- * Copyright (C) 2018 David Lechner <david@lechnology.com>
- */
-
-#ifndef __LINUX_PLATFORM_DATA_CLK_DAVINCI_PLL_H__
-#define __LINUX_PLATFORM_DATA_CLK_DAVINCI_PLL_H__
-
-#include <linux/regmap.h>
-
-/**
- * davinci_pll_platform_data
- * @cfgchip: CFGCHIP syscon regmap
- */
-struct davinci_pll_platform_data {
-	struct regmap *cfgchip;
-};
-
-#endif /* __LINUX_PLATFORM_DATA_CLK_DAVINCI_PLL_H__ */
-- 
2.45.2

Re: [PATCH] clk: davinci: remove platform data struct

Posted by David Lechner 1 year ago

On 12/10/24 11:57 AM, Bartosz Golaszewski wrote:
> From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
> 
> There are no board files using struct davinci_pll_platform_data anymore.
> The structure itself is currently used to store a single pointer. Let's
> remove the struct definition, the header and rework the driver to not
> require the syscon regmap to be stored in probe().
> 
> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
> ---
>  drivers/clk/davinci/pll.c                     | 33 +++----------------
>  include/linux/platform_data/clk-davinci-pll.h | 21 ------------
>  2 files changed, 4 insertions(+), 50 deletions(-)
>  delete mode 100644 include/linux/platform_data/clk-davinci-pll.h
> 
> diff --git a/drivers/clk/davinci/pll.c b/drivers/clk/davinci/pll.c
> index 5bbbb3a66477..b284da602f8d 100644
> --- a/drivers/clk/davinci/pll.c
> +++ b/drivers/clk/davinci/pll.c
> @@ -19,7 +19,6 @@
>  #include <linux/mfd/syscon.h>
>  #include <linux/notifier.h>
>  #include <linux/of.h>
> -#include <linux/platform_data/clk-davinci-pll.h>
>  #include <linux/platform_device.h>
>  #include <linux/property.h>
>  #include <linux/regmap.h>
> @@ -840,27 +839,6 @@ int of_davinci_pll_init(struct device *dev, struct device_node *node,
>  	return 0;
>  }
>  
> -static struct davinci_pll_platform_data *davinci_pll_get_pdata(struct device *dev)
> -{
> -	struct davinci_pll_platform_data *pdata = dev_get_platdata(dev);
> -
> -	/*
> -	 * Platform data is optional, so allocate a new struct if one was not
> -	 * provided. For device tree, this will always be the case.
> -	 */
> -	if (!pdata)
> -		pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
> -	if (!pdata)
> -		return NULL;
> -
> -	/* for device tree, we need to fill in the struct */
> -	if (dev->of_node)
> -		pdata->cfgchip =
> -			syscon_regmap_lookup_by_compatible("ti,da830-cfgchip");
> -
> -	return pdata;
> -}
> -
>  /* needed in early boot for clocksource/clockevent */
>  #ifdef CONFIG_ARCH_DAVINCI_DA850
>  CLK_OF_DECLARE(da850_pll0, "ti,da850-pll0", of_da850_pll0_init);
> @@ -890,8 +868,8 @@ typedef int (*davinci_pll_init)(struct device *dev, void __iomem *base,
>  static int davinci_pll_probe(struct platform_device *pdev)
>  {
>  	struct device *dev = &pdev->dev;
> -	struct davinci_pll_platform_data *pdata;
>  	davinci_pll_init pll_init = NULL;
> +	struct regmap *cfgchip;

I think we need to initialize this to NULL since it is only set
conditionally later.

>  	void __iomem *base;
>  
>  	pll_init = device_get_match_data(dev);
> @@ -903,17 +881,14 @@ static int davinci_pll_probe(struct platform_device *pdev)
>  		return -EINVAL;
>  	}
>  
> -	pdata = davinci_pll_get_pdata(dev);
> -	if (!pdata) {
> -		dev_err(dev, "missing platform data\n");
> -		return -EINVAL;
> -	}
> +	if (dev->of_node)

Or just leave out the if here.

> +		cfgchip = syscon_regmap_lookup_by_compatible("ti,da830-cfgchip");
>  
>  	base = devm_platform_ioremap_resource(pdev, 0);
>  	if (IS_ERR(base))
>  		return PTR_ERR(base);
>  
> -	return pll_init(dev, base, pdata->cfgchip);
> +	return pll_init(dev, base, cfgchip);
>  }
>

Re: [PATCH] clk: davinci: remove platform data struct

Posted by Bartosz Golaszewski 12 months ago

On Mon, Dec 16, 2024 at 9:29 PM David Lechner <david@lechnology.com> wrote:
>
> On 12/10/24 11:57 AM, Bartosz Golaszewski wrote:
> > From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
> >
> > There are no board files using struct davinci_pll_platform_data anymore.
> > The structure itself is currently used to store a single pointer. Let's
> > remove the struct definition, the header and rework the driver to not
> > require the syscon regmap to be stored in probe().
> >
> > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
> > ---
> >
> > -     pdata = davinci_pll_get_pdata(dev);
> > -     if (!pdata) {
> > -             dev_err(dev, "missing platform data\n");
> > -             return -EINVAL;
> > -     }
> > +     if (dev->of_node)
>
> Or just leave out the if here.
>

Right, that's not at all necessary.

Bart