pwm: mediatek: Make use of devm_pwmchip_alloc() function

This prepares the pwm-mediatek driver to further changes of the pwm core
outlined in the commit introducing devm_pwmchip_alloc(). There is no
intended semantical change and the driver should behave as before.

Link: https://lore.kernel.org/r/513b2037c00ebf2f3a69472f4b99adaf4fb40d83.1707900770.git.u.kleine-koenig@pengutronix.de
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

diff --git a/drivers/pwm/pwm-mediatek.c b/drivers/pwm/pwm-mediatek.c
index d8bdadb7b338e9ef4b4700630f9d6733abacb5b7..19a87873ad6070cb78012406d63e4a4c3de92751 100644 (file)
--- a/drivers/pwm/pwm-mediatek.c
+++ b/drivers/pwm/pwm-mediatek.c
@@ -42,7 +42,6 @@ struct pwm_mediatek_of_data {
 
 /**
  * struct pwm_mediatek_chip - struct representing PWM chip
- * @chip: linux PWM chip representation
  * @regs: base address of PWM chip
  * @clk_top: the top clock generator
  * @clk_main: the clock used by PWM core
@@ -50,7 +49,6 @@ struct pwm_mediatek_of_data {
  * @soc: pointer to chip's platform data
  */
 struct pwm_mediatek_chip {
-       struct pwm_chip chip;
        void __iomem *regs;
        struct clk *clk_top;
        struct clk *clk_main;
@@ -69,7 +67,7 @@ static const unsigned int mtk_pwm_reg_offset_v2[] = {
 static inline struct pwm_mediatek_chip *
 to_pwm_mediatek_chip(struct pwm_chip *chip)
 {
-       return container_of(chip, struct pwm_mediatek_chip, chip);
+       return pwmchip_get_drvdata(chip);
 }
 
 static int pwm_mediatek_clk_enable(struct pwm_chip *chip,
@@ -232,21 +230,26 @@ static const struct pwm_ops pwm_mediatek_ops = {
 
 static int pwm_mediatek_probe(struct platform_device *pdev)
 {
+       struct pwm_chip *chip;
        struct pwm_mediatek_chip *pc;
+       const struct pwm_mediatek_of_data *soc;
        unsigned int i;
        int ret;
 
-       pc = devm_kzalloc(&pdev->dev, sizeof(*pc), GFP_KERNEL);
-       if (!pc)
-               return -ENOMEM;
+       soc = of_device_get_match_data(&pdev->dev);
+
+       chip = devm_pwmchip_alloc(&pdev->dev, soc->num_pwms, sizeof(*pc));
+       if (IS_ERR(chip))
+               return PTR_ERR(chip);
+       pc = to_pwm_mediatek_chip(chip);
 
-       pc->soc = of_device_get_match_data(&pdev->dev);
+       pc->soc = soc;
 
        pc->regs = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(pc->regs))
                return PTR_ERR(pc->regs);
 
-       pc->clk_pwms = devm_kmalloc_array(&pdev->dev, pc->soc->num_pwms,
+       pc->clk_pwms = devm_kmalloc_array(&pdev->dev, soc->num_pwms,
                                    sizeof(*pc->clk_pwms), GFP_KERNEL);
        if (!pc->clk_pwms)
                return -ENOMEM;
@@ -261,7 +264,7 @@ static int pwm_mediatek_probe(struct platform_device *pdev)
                return dev_err_probe(&pdev->dev, PTR_ERR(pc->clk_main),
                                     "Failed to get main clock\n");
 
-       for (i = 0; i < pc->soc->num_pwms; i++) {
+       for (i = 0; i < soc->num_pwms; i++) {
                char name[8];
 
                snprintf(name, sizeof(name), "pwm%d", i + 1);
@@ -272,11 +275,9 @@ static int pwm_mediatek_probe(struct platform_device *pdev)
                                             "Failed to get %s clock\n", name);
        }
 
-       pc->chip.dev = &pdev->dev;
-       pc->chip.ops = &pwm_mediatek_ops;
-       pc->chip.npwm = pc->soc->num_pwms;
+       chip->ops = &pwm_mediatek_ops;
 
-       ret = devm_pwmchip_add(&pdev->dev, &pc->chip);
+       ret = devm_pwmchip_add(&pdev->dev, chip);
        if (ret < 0)
                return dev_err_probe(&pdev->dev, ret, "pwmchip_add() failed\n");