diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2024-02-14 12:32:10 +0300 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2024-02-19 13:04:13 +0300 |
| commit | 37e0f5800b096015e1757c130f0dde9e658d5daa (patch) | |
| tree | ca1b4f53d779ea61e50d3adb5cdfb17ac48ca466 /drivers/pwm | |
| parent | 20666a774d17094207799b3d97044f60804d29aa (diff) | |
| download | linux-37e0f5800b096015e1757c130f0dde9e658d5daa.tar.xz | |
pwm: pca9685: Make use of devm_pwmchip_alloc() function
This prepares the pwm-pca9685 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/4cb65adc92414a901dd3c0b8412de075196a3c54.1707900770.git.u.kleine-koenig@pengutronix.de
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Diffstat (limited to 'drivers/pwm')
| -rw-r--r-- | drivers/pwm/pwm-pca9685.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/pwm/pwm-pca9685.c b/drivers/pwm/pwm-pca9685.c index e976a5ca1e7b..c5da2a6ed846 100644 --- a/drivers/pwm/pwm-pca9685.c +++ b/drivers/pwm/pwm-pca9685.c @@ -76,7 +76,6 @@ #define REG_OFF_L(C) ((C) >= PCA9685_MAXCHAN ? PCA9685_ALL_LED_OFF_L : LED_N_OFF_L((C))) struct pca9685 { - struct pwm_chip chip; struct regmap *regmap; struct mutex lock; DECLARE_BITMAP(pwms_enabled, PCA9685_MAXCHAN + 1); @@ -88,7 +87,7 @@ struct pca9685 { static inline struct pca9685 *to_pca(struct pwm_chip *chip) { - return container_of(chip, struct pca9685, chip); + return pwmchip_get_drvdata(chip); } /* This function is supposed to be called with the lock mutex held */ @@ -526,9 +525,11 @@ static int pca9685_pwm_probe(struct i2c_client *client) unsigned int reg; int ret; - pca = devm_kzalloc(&client->dev, sizeof(*pca), GFP_KERNEL); - if (!pca) - return -ENOMEM; + /* Add an extra channel for ALL_LED */ + chip = devm_pwmchip_alloc(&client->dev, PCA9685_MAXCHAN + 1, sizeof(*pca)); + if (IS_ERR(chip)) + return PTR_ERR(chip); + pca = to_pca(chip); pca->regmap = devm_regmap_init_i2c(client, &pca9685_regmap_i2c_config); if (IS_ERR(pca->regmap)) { @@ -537,7 +538,6 @@ static int pca9685_pwm_probe(struct i2c_client *client) ret); return ret; } - chip = &pca->chip; i2c_set_clientdata(client, chip); @@ -573,10 +573,6 @@ static int pca9685_pwm_probe(struct i2c_client *client) pca9685_write_reg(chip, PCA9685_ALL_LED_ON_H, LED_FULL); chip->ops = &pca9685_pwm_ops; - /* Add an extra channel for ALL_LED */ - chip->npwm = PCA9685_MAXCHAN + 1; - - chip->dev = &client->dev; ret = pwmchip_add(chip); if (ret < 0) |