Merge tag 'vfs-6.13-rc7.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs

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

diff --git a/drivers/pwm/pwm-twl.c b/drivers/pwm/pwm-twl.c
index 68e02c9a6bf9a1e519b91e537ebf44495813c793..8f981ffff4b4e20f8acbd8e309f83a5a631760e0 100644 (file)
--- a/drivers/pwm/pwm-twl.c
+++ b/drivers/pwm/pwm-twl.c
@@ -46,7 +46,6 @@
 #define TWL6030_PWM_TOGGLE(pwm, x)     ((x) << (pwm * 3))
 
 struct twl_pwm_chip {
 #define TWL6030_PWM_TOGGLE(pwm, x)     ((x) << (pwm * 3))
 
 struct twl_pwm_chip {

-       struct pwm_chip chip;

        struct mutex mutex;
        u8 twl6030_toggle3;
        u8 twl4030_pwm_mux;
        struct mutex mutex;
        u8 twl6030_toggle3;
        u8 twl4030_pwm_mux;


@@ -54,7 +53,7 @@ struct twl_pwm_chip {
 
 static inline struct twl_pwm_chip *to_twl(struct pwm_chip *chip)
 {
 
 static inline struct twl_pwm_chip *to_twl(struct pwm_chip *chip)
 {

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

 }
 
 static int twl_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
 }
 
 static int twl_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,


@@ -86,7 +85,7 @@ static int twl_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
 
        ret = twl_i2c_write(TWL_MODULE_PWM, pwm_config, base, 2);
        if (ret < 0)
 
        ret = twl_i2c_write(TWL_MODULE_PWM, pwm_config, base, 2);
        if (ret < 0)

-               dev_err(chip->dev, "%s: Failed to configure PWM\n", pwm->label);
+               dev_err(pwmchip_parent(chip), "%s: Failed to configure PWM\n", pwm->label);

 
        return ret;
 }
 
        return ret;
 }


@@ -100,7 +99,7 @@ static int twl4030_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
        mutex_lock(&twl->mutex);
        ret = twl_i2c_read_u8(TWL4030_MODULE_INTBR, &val, TWL4030_GPBR1_REG);
        if (ret < 0) {
        mutex_lock(&twl->mutex);
        ret = twl_i2c_read_u8(TWL4030_MODULE_INTBR, &val, TWL4030_GPBR1_REG);
        if (ret < 0) {

-               dev_err(chip->dev, "%s: Failed to read GPBR1\n", pwm->label);
+               dev_err(pwmchip_parent(chip), "%s: Failed to read GPBR1\n", pwm->label);

                goto out;
        }
 
                goto out;
        }
 


@@ -108,13 +107,13 @@ static int twl4030_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
 
        ret = twl_i2c_write_u8(TWL4030_MODULE_INTBR, val, TWL4030_GPBR1_REG);
        if (ret < 0)
 
        ret = twl_i2c_write_u8(TWL4030_MODULE_INTBR, val, TWL4030_GPBR1_REG);
        if (ret < 0)

-               dev_err(chip->dev, "%s: Failed to enable PWM\n", pwm->label);
+               dev_err(pwmchip_parent(chip), "%s: Failed to enable PWM\n", pwm->label);

 
        val |= TWL4030_PWM_TOGGLE(pwm->hwpwm, TWL4030_PWMX_ENABLE);
 
        ret = twl_i2c_write_u8(TWL4030_MODULE_INTBR, val, TWL4030_GPBR1_REG);
        if (ret < 0)
 
        val |= TWL4030_PWM_TOGGLE(pwm->hwpwm, TWL4030_PWMX_ENABLE);
 
        ret = twl_i2c_write_u8(TWL4030_MODULE_INTBR, val, TWL4030_GPBR1_REG);
        if (ret < 0)

-               dev_err(chip->dev, "%s: Failed to enable PWM\n", pwm->label);
+               dev_err(pwmchip_parent(chip), "%s: Failed to enable PWM\n", pwm->label);

 
 out:
        mutex_unlock(&twl->mutex);
 
 out:
        mutex_unlock(&twl->mutex);


@@ -130,7 +129,7 @@ static void twl4030_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
        mutex_lock(&twl->mutex);
        ret = twl_i2c_read_u8(TWL4030_MODULE_INTBR, &val, TWL4030_GPBR1_REG);
        if (ret < 0) {
        mutex_lock(&twl->mutex);
        ret = twl_i2c_read_u8(TWL4030_MODULE_INTBR, &val, TWL4030_GPBR1_REG);
        if (ret < 0) {

-               dev_err(chip->dev, "%s: Failed to read GPBR1\n", pwm->label);
+               dev_err(pwmchip_parent(chip), "%s: Failed to read GPBR1\n", pwm->label);

                goto out;
        }
 
                goto out;
        }
 


@@ -138,13 +137,13 @@ static void twl4030_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
 
        ret = twl_i2c_write_u8(TWL4030_MODULE_INTBR, val, TWL4030_GPBR1_REG);
        if (ret < 0)
 
        ret = twl_i2c_write_u8(TWL4030_MODULE_INTBR, val, TWL4030_GPBR1_REG);
        if (ret < 0)

-               dev_err(chip->dev, "%s: Failed to disable PWM\n", pwm->label);
+               dev_err(pwmchip_parent(chip), "%s: Failed to disable PWM\n", pwm->label);

 
        val &= ~TWL4030_PWM_TOGGLE(pwm->hwpwm, TWL4030_PWMXCLK_ENABLE);
 
        ret = twl_i2c_write_u8(TWL4030_MODULE_INTBR, val, TWL4030_GPBR1_REG);
        if (ret < 0)
 
        val &= ~TWL4030_PWM_TOGGLE(pwm->hwpwm, TWL4030_PWMXCLK_ENABLE);
 
        ret = twl_i2c_write_u8(TWL4030_MODULE_INTBR, val, TWL4030_GPBR1_REG);
        if (ret < 0)

-               dev_err(chip->dev, "%s: Failed to disable PWM\n", pwm->label);
+               dev_err(pwmchip_parent(chip), "%s: Failed to disable PWM\n", pwm->label);

 
 out:
        mutex_unlock(&twl->mutex);
 
 out:
        mutex_unlock(&twl->mutex);


@@ -167,7 +166,7 @@ static int twl4030_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm)
        mutex_lock(&twl->mutex);
        ret = twl_i2c_read_u8(TWL4030_MODULE_INTBR, &val, TWL4030_PMBR1_REG);
        if (ret < 0) {
        mutex_lock(&twl->mutex);
        ret = twl_i2c_read_u8(TWL4030_MODULE_INTBR, &val, TWL4030_PMBR1_REG);
        if (ret < 0) {

-               dev_err(chip->dev, "%s: Failed to read PMBR1\n", pwm->label);
+               dev_err(pwmchip_parent(chip), "%s: Failed to read PMBR1\n", pwm->label);

                goto out;
        }
 
                goto out;
        }
 


@@ -181,7 +180,7 @@ static int twl4030_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm)
 
        ret = twl_i2c_write_u8(TWL4030_MODULE_INTBR, val, TWL4030_PMBR1_REG);
        if (ret < 0)
 
        ret = twl_i2c_write_u8(TWL4030_MODULE_INTBR, val, TWL4030_PMBR1_REG);
        if (ret < 0)

-               dev_err(chip->dev, "%s: Failed to request PWM\n", pwm->label);
+               dev_err(pwmchip_parent(chip), "%s: Failed to request PWM\n", pwm->label);

 
 out:
        mutex_unlock(&twl->mutex);
 
 out:
        mutex_unlock(&twl->mutex);


@@ -202,7 +201,7 @@ static void twl4030_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm)
        mutex_lock(&twl->mutex);
        ret = twl_i2c_read_u8(TWL4030_MODULE_INTBR, &val, TWL4030_PMBR1_REG);
        if (ret < 0) {
        mutex_lock(&twl->mutex);
        ret = twl_i2c_read_u8(TWL4030_MODULE_INTBR, &val, TWL4030_PMBR1_REG);
        if (ret < 0) {

-               dev_err(chip->dev, "%s: Failed to read PMBR1\n", pwm->label);
+               dev_err(pwmchip_parent(chip), "%s: Failed to read PMBR1\n", pwm->label);

                goto out;
        }
 
                goto out;
        }
 


@@ -212,7 +211,7 @@ static void twl4030_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm)
 
        ret = twl_i2c_write_u8(TWL4030_MODULE_INTBR, val, TWL4030_PMBR1_REG);
        if (ret < 0)
 
        ret = twl_i2c_write_u8(TWL4030_MODULE_INTBR, val, TWL4030_PMBR1_REG);
        if (ret < 0)

-               dev_err(chip->dev, "%s: Failed to free PWM\n", pwm->label);
+               dev_err(pwmchip_parent(chip), "%s: Failed to free PWM\n", pwm->label);

 
 out:
        mutex_unlock(&twl->mutex);
 
 out:
        mutex_unlock(&twl->mutex);


@@ -231,7 +230,7 @@ static int twl6030_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
 
        ret = twl_i2c_write_u8(TWL6030_MODULE_ID1, val, TWL6030_TOGGLE3_REG);
        if (ret < 0) {
 
        ret = twl_i2c_write_u8(TWL6030_MODULE_ID1, val, TWL6030_TOGGLE3_REG);
        if (ret < 0) {

-               dev_err(chip->dev, "%s: Failed to enable PWM\n", pwm->label);
+               dev_err(pwmchip_parent(chip), "%s: Failed to enable PWM\n", pwm->label);

                goto out;
        }
 
                goto out;
        }
 


@@ -254,7 +253,7 @@ static void twl6030_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
 
        ret = twl_i2c_write_u8(TWL6030_MODULE_ID1, val, TWL6030_TOGGLE3_REG);
        if (ret < 0) {
 
        ret = twl_i2c_write_u8(TWL6030_MODULE_ID1, val, TWL6030_TOGGLE3_REG);
        if (ret < 0) {

-               dev_err(chip->dev, "%s: Failed to disable PWM\n", pwm->label);
+               dev_err(pwmchip_parent(chip), "%s: Failed to disable PWM\n", pwm->label);

                goto out;
        }
 
                goto out;
        }
 


@@ -262,7 +261,7 @@ static void twl6030_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
 
        ret = twl_i2c_write_u8(TWL6030_MODULE_ID1, val, TWL6030_TOGGLE3_REG);
        if (ret < 0) {
 
        ret = twl_i2c_write_u8(TWL6030_MODULE_ID1, val, TWL6030_TOGGLE3_REG);
        if (ret < 0) {

-               dev_err(chip->dev, "%s: Failed to disable PWM\n", pwm->label);
+               dev_err(pwmchip_parent(chip), "%s: Failed to disable PWM\n", pwm->label);

                goto out;
        }
 
                goto out;
        }
 


@@ -270,7 +269,7 @@ static void twl6030_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
 
        ret = twl_i2c_write_u8(TWL6030_MODULE_ID1, val, TWL6030_TOGGLE3_REG);
        if (ret < 0) {
 
        ret = twl_i2c_write_u8(TWL6030_MODULE_ID1, val, TWL6030_TOGGLE3_REG);
        if (ret < 0) {

-               dev_err(chip->dev, "%s: Failed to disable PWM\n", pwm->label);
+               dev_err(pwmchip_parent(chip), "%s: Failed to disable PWM\n", pwm->label);

                goto out;
        }
 
                goto out;
        }
 


@@ -341,23 +340,22 @@ static const struct pwm_ops twl6030_pwm_ops = {
 
 static int twl_pwm_probe(struct platform_device *pdev)
 {
 
 static int twl_pwm_probe(struct platform_device *pdev)
 {

+       struct pwm_chip *chip;

        struct twl_pwm_chip *twl;
 
        struct twl_pwm_chip *twl;
 

-       twl = devm_kzalloc(&pdev->dev, sizeof(*twl), GFP_KERNEL);
-       if (!twl)
-               return -ENOMEM;
+       chip = devm_pwmchip_alloc(&pdev->dev, 2, sizeof(*twl));
+       if (IS_ERR(chip))
+               return PTR_ERR(chip);
+       twl = to_twl(chip);

 
        if (twl_class_is_4030())
 
        if (twl_class_is_4030())

-               twl->chip.ops = &twl4030_pwm_ops;
+               chip->ops = &twl4030_pwm_ops;

        else
        else

-               twl->chip.ops = &twl6030_pwm_ops;
-
-       twl->chip.dev = &pdev->dev;
-       twl->chip.npwm = 2;
+               chip->ops = &twl6030_pwm_ops;

 
        mutex_init(&twl->mutex);
 
 
        mutex_init(&twl->mutex);
 

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

 }
 
 #ifdef CONFIG_OF
 }
 
 #ifdef CONFIG_OF