Commit 79dedfad authored by Uwe Kleine-König's avatar Uwe Kleine-König

hwmon: (aspeed-g6-pwm-tacho): Make use of devm_pwmchip_alloc() function

This prepares the aspeed-g6-pwm-tacho 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.
Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/e95e41eea5a138ae206c9116ba3cb1d9e0178284.1710777536.git.u.kleine-koenig@pengutronix.deSigned-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent 940052bc
...@@ -136,7 +136,6 @@ struct aspeed_pwm_tach_data { ...@@ -136,7 +136,6 @@ struct aspeed_pwm_tach_data {
struct clk *clk; struct clk *clk;
struct reset_control *reset; struct reset_control *reset;
unsigned long clk_rate; unsigned long clk_rate;
struct pwm_chip chip;
bool tach_present[TACH_ASPEED_NR_TACHS]; bool tach_present[TACH_ASPEED_NR_TACHS];
u32 tach_divisor; u32 tach_divisor;
}; };
...@@ -144,7 +143,7 @@ struct aspeed_pwm_tach_data { ...@@ -144,7 +143,7 @@ struct aspeed_pwm_tach_data {
static inline struct aspeed_pwm_tach_data * static inline struct aspeed_pwm_tach_data *
aspeed_pwm_chip_to_data(struct pwm_chip *chip) aspeed_pwm_chip_to_data(struct pwm_chip *chip)
{ {
return container_of(chip, struct aspeed_pwm_tach_data, chip); return pwmchip_get_drvdata(chip);
} }
static int aspeed_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm, static int aspeed_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm,
...@@ -459,6 +458,7 @@ static int aspeed_pwm_tach_probe(struct platform_device *pdev) ...@@ -459,6 +458,7 @@ static int aspeed_pwm_tach_probe(struct platform_device *pdev)
int ret; int ret;
struct device_node *child; struct device_node *child;
struct aspeed_pwm_tach_data *priv; struct aspeed_pwm_tach_data *priv;
struct pwm_chip *chip;
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
if (!priv) if (!priv)
...@@ -487,11 +487,14 @@ static int aspeed_pwm_tach_probe(struct platform_device *pdev) ...@@ -487,11 +487,14 @@ static int aspeed_pwm_tach_probe(struct platform_device *pdev)
if (ret) if (ret)
return ret; return ret;
priv->chip.dev = dev; chip = devm_pwmchip_alloc(dev, PWM_ASPEED_NR_PWMS, 0);
priv->chip.ops = &aspeed_pwm_ops; if (IS_ERR(chip))
priv->chip.npwm = PWM_ASPEED_NR_PWMS; return PTR_ERR(chip);
ret = devm_pwmchip_add(dev, &priv->chip); pwmchip_set_drvdata(chip, priv);
chip->ops = &aspeed_pwm_ops;
ret = devm_pwmchip_add(dev, chip);
if (ret) if (ret)
return dev_err_probe(dev, ret, "Failed to add PWM chip\n"); return dev_err_probe(dev, ret, "Failed to add PWM chip\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment