mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

pwm: twl: Make use of pwmchip_parent() accessor

Browse source 
struct pwm_chip::dev is about to change. To not have to touch this
driver in the same commit as struct pwm_chip::dev, use the accessor
function provided for exactly this purpose.

Link: https://lore.kernel.org/r/f11beb6b3a398d1257219a635a78ed0b02263978.1707900770.git.u.kleine-koenig@pengutronix.de
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
This commit is contained in:
Uwe Kleine-König 2024-02-14 10:33:07 +01:00
parent de830057d7
commit 6a20d5ed0e
1 changed files with 15 additions and 15 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

30
drivers/pwm/pwm-twl.c
View file

@ -86,7 +86,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); ret = twl_i2c_write(TWL_MODULE_PWM, pwm_config, base, 2);
if (ret < 0) 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 +100,7 @@ static int twl4030_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
mutex_lock(&twl->mutex); mutex_lock(&twl->mutex);
ret = twl_i2c_read_u8(TWL4030_MODULE_INTBR, &val, TWL4030_GPBR1_REG); ret = twl_i2c_read_u8(TWL4030_MODULE_INTBR, &val, TWL4030_GPBR1_REG);
if (ret < 0) { 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 +108,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); ret = twl_i2c_write_u8(TWL4030_MODULE_INTBR, val, TWL4030_GPBR1_REG);
if (ret < 0) 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); val |= TWL4030_PWM_TOGGLE(pwm->hwpwm, TWL4030_PWMX_ENABLE);
ret = twl_i2c_write_u8(TWL4030_MODULE_INTBR, val, TWL4030_GPBR1_REG); ret = twl_i2c_write_u8(TWL4030_MODULE_INTBR, val, TWL4030_GPBR1_REG);
if (ret < 0) 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: out:
mutex_unlock(&twl->mutex); mutex_unlock(&twl->mutex);
@ -130,7 +130,7 @@ static void twl4030_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
mutex_lock(&twl->mutex); mutex_lock(&twl->mutex);
ret = twl_i2c_read_u8(TWL4030_MODULE_INTBR, &val, TWL4030_GPBR1_REG); ret = twl_i2c_read_u8(TWL4030_MODULE_INTBR, &val, TWL4030_GPBR1_REG);
if (ret < 0) { 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 +138,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); ret = twl_i2c_write_u8(TWL4030_MODULE_INTBR, val, TWL4030_GPBR1_REG);
if (ret < 0) 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); val &= ~TWL4030_PWM_TOGGLE(pwm->hwpwm, TWL4030_PWMXCLK_ENABLE);
ret = twl_i2c_write_u8(TWL4030_MODULE_INTBR, val, TWL4030_GPBR1_REG); ret = twl_i2c_write_u8(TWL4030_MODULE_INTBR, val, TWL4030_GPBR1_REG);
if (ret < 0) 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: out:
mutex_unlock(&twl->mutex); mutex_unlock(&twl->mutex);
@ -167,7 +167,7 @@ static int twl4030_pwm_request(struct pwm_chip *chip, struct pwm_device *pwm)
mutex_lock(&twl->mutex); mutex_lock(&twl->mutex);
ret = twl_i2c_read_u8(TWL4030_MODULE_INTBR, &val, TWL4030_PMBR1_REG); ret = twl_i2c_read_u8(TWL4030_MODULE_INTBR, &val, TWL4030_PMBR1_REG);
if (ret < 0) { 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 +181,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); ret = twl_i2c_write_u8(TWL4030_MODULE_INTBR, val, TWL4030_PMBR1_REG);
if (ret < 0) 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: out:
mutex_unlock(&twl->mutex); mutex_unlock(&twl->mutex);
@ -202,7 +202,7 @@ static void twl4030_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm)
mutex_lock(&twl->mutex); mutex_lock(&twl->mutex);
ret = twl_i2c_read_u8(TWL4030_MODULE_INTBR, &val, TWL4030_PMBR1_REG); ret = twl_i2c_read_u8(TWL4030_MODULE_INTBR, &val, TWL4030_PMBR1_REG);
if (ret < 0) { 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 +212,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); ret = twl_i2c_write_u8(TWL4030_MODULE_INTBR, val, TWL4030_PMBR1_REG);
if (ret < 0) 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: out:
mutex_unlock(&twl->mutex); mutex_unlock(&twl->mutex);
@ -231,7 +231,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); ret = twl_i2c_write_u8(TWL6030_MODULE_ID1, val, TWL6030_TOGGLE3_REG);
if (ret < 0) { 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 +254,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); ret = twl_i2c_write_u8(TWL6030_MODULE_ID1, val, TWL6030_TOGGLE3_REG);
if (ret < 0) { 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 +262,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); ret = twl_i2c_write_u8(TWL6030_MODULE_ID1, val, TWL6030_TOGGLE3_REG);
if (ret < 0) { 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 +270,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); ret = twl_i2c_write_u8(TWL6030_MODULE_ID1, val, TWL6030_TOGGLE3_REG);
if (ret < 0) { 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;
} }