Merge tag 'kbuild-v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

[J-linux.git] / drivers / pwm / pwm-crc.c

diff --git a/drivers/pwm/pwm-crc.c b/drivers/pwm/pwm-crc.c
index e09358901ab508dd3a434a54285606a83147d220..98ee5cdbd0bad645ba59fcd8eee5426e0f1acac3 100644 (file)
--- a/drivers/pwm/pwm-crc.c
+++ b/drivers/pwm/pwm-crc.c
@@ -26,17 +26,15 @@
 
 /**
  * struct crystalcove_pwm - Crystal Cove PWM controller
 
 /**
  * struct crystalcove_pwm - Crystal Cove PWM controller

- * @chip: the abstract pwm_chip structure.

  * @regmap: the regmap from the parent device.
  */
 struct crystalcove_pwm {
  * @regmap: the regmap from the parent device.
  */
 struct crystalcove_pwm {

-       struct pwm_chip chip;

        struct regmap *regmap;
 };
 
 static inline struct crystalcove_pwm *to_crc_pwm(struct pwm_chip *chip)
 {
        struct regmap *regmap;
 };
 
 static inline struct crystalcove_pwm *to_crc_pwm(struct pwm_chip *chip)
 {

-       return container_of(chip, struct crystalcove_pwm, chip);
+       return pwmchip_get_drvdata(chip);

 }
 
 static int crc_pwm_calc_clk_div(int period_ns)
 }
 
 static int crc_pwm_calc_clk_div(int period_ns)


@@ -55,7 +53,7 @@ static int crc_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,
                         const struct pwm_state *state)
 {
        struct crystalcove_pwm *crc_pwm = to_crc_pwm(chip);
                         const struct pwm_state *state)
 {
        struct crystalcove_pwm *crc_pwm = to_crc_pwm(chip);

-       struct device *dev = crc_pwm->chip.dev;
+       struct device *dev = pwmchip_parent(chip);

        int err;
 
        if (state->period > PWM_MAX_PERIOD_NS) {
        int err;
 
        if (state->period > PWM_MAX_PERIOD_NS) {


@@ -125,7 +123,7 @@ static int crc_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm,
                             struct pwm_state *state)
 {
        struct crystalcove_pwm *crc_pwm = to_crc_pwm(chip);
                             struct pwm_state *state)
 {
        struct crystalcove_pwm *crc_pwm = to_crc_pwm(chip);

-       struct device *dev = crc_pwm->chip.dev;
+       struct device *dev = pwmchip_parent(chip);

        unsigned int clk_div, clk_div_reg, duty_cycle_reg;
        int error;
 
        unsigned int clk_div, clk_div_reg, duty_cycle_reg;
        int error;
 


@@ -160,22 +158,22 @@ static const struct pwm_ops crc_pwm_ops = {
 
 static int crystalcove_pwm_probe(struct platform_device *pdev)
 {
 
 static int crystalcove_pwm_probe(struct platform_device *pdev)
 {

+       struct pwm_chip *chip;

        struct crystalcove_pwm *crc_pwm;
        struct device *dev = pdev->dev.parent;
        struct intel_soc_pmic *pmic = dev_get_drvdata(dev);
 
        struct crystalcove_pwm *crc_pwm;
        struct device *dev = pdev->dev.parent;
        struct intel_soc_pmic *pmic = dev_get_drvdata(dev);
 

-       crc_pwm = devm_kzalloc(&pdev->dev, sizeof(*crc_pwm), GFP_KERNEL);
-       if (!crc_pwm)
-               return -ENOMEM;
+       chip = devm_pwmchip_alloc(&pdev->dev, 1, sizeof(*crc_pwm));
+       if (IS_ERR(chip))
+               return PTR_ERR(chip);
+       crc_pwm = to_crc_pwm(chip);

 
 

-       crc_pwm->chip.dev = &pdev->dev;
-       crc_pwm->chip.ops = &crc_pwm_ops;
-       crc_pwm->chip.npwm = 1;
+       chip->ops = &crc_pwm_ops;

 
        /* get the PMIC regmap */
        crc_pwm->regmap = pmic->regmap;
 
 
        /* get the PMIC regmap */
        crc_pwm->regmap = pmic->regmap;
 

-       return devm_pwmchip_add(&pdev->dev, &crc_pwm->chip);
+       return devm_pwmchip_add(&pdev->dev, chip);

 }
 
 static struct platform_driver crystalcove_pwm_driver = {
 }
 
 static struct platform_driver crystalcove_pwm_driver = {