Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

pwm: bcm-iproc: Make use of devm_pwmchip_alloc() function

This prepares the pwm-bcm-iproc 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/cdc6136b94f685c85a615e9e5ccbd7ebb2f91cfc.1707900770.git.u.kleine-koenig@pengutronix.de
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

+9 -10
+9 -10
drivers/pwm/pwm-bcm-iproc.c
··· 34 34 #define IPROC_PWM_PRESCALE_MAX 0x3f 35 35 36 36 struct iproc_pwmc { 37 - struct pwm_chip chip; 38 37 void __iomem *base; 39 38 struct clk *clk; 40 39 }; 41 40 42 41 static inline struct iproc_pwmc *to_iproc_pwmc(struct pwm_chip *chip) 43 42 { 44 - return container_of(chip, struct iproc_pwmc, chip); 43 + return pwmchip_get_drvdata(chip); 45 44 } 46 45 47 46 static void iproc_pwmc_enable(struct iproc_pwmc *ip, unsigned int channel) ··· 186 187 187 188 static int iproc_pwmc_probe(struct platform_device *pdev) 188 189 { 190 + struct pwm_chip *chip; 189 191 struct iproc_pwmc *ip; 190 192 unsigned int i; 191 193 u32 value; 192 194 int ret; 193 195 194 - ip = devm_kzalloc(&pdev->dev, sizeof(*ip), GFP_KERNEL); 195 - if (!ip) 196 - return -ENOMEM; 196 + chip = devm_pwmchip_alloc(&pdev->dev, 4, sizeof(*ip)); 197 + if (IS_ERR(chip)) 198 + return PTR_ERR(chip); 199 + ip = to_iproc_pwmc(chip); 197 200 198 201 platform_set_drvdata(pdev, ip); 199 202 200 - ip->chip.dev = &pdev->dev; 201 - ip->chip.ops = &iproc_pwm_ops; 202 - ip->chip.npwm = 4; 203 + chip->ops = &iproc_pwm_ops; 203 204 204 205 ip->base = devm_platform_ioremap_resource(pdev, 0); 205 206 if (IS_ERR(ip->base)) ··· 213 214 /* Set full drive and normal polarity for all channels */ 214 215 value = readl(ip->base + IPROC_PWM_CTRL_OFFSET); 215 216 216 - for (i = 0; i < ip->chip.npwm; i++) { 217 + for (i = 0; i < chip->npwm; i++) { 217 218 value &= ~(1 << IPROC_PWM_CTRL_TYPE_SHIFT(i)); 218 219 value |= 1 << IPROC_PWM_CTRL_POLARITY_SHIFT(i); 219 220 } 220 221 221 222 writel(value, ip->base + IPROC_PWM_CTRL_OFFSET); 222 223 223 - ret = devm_pwmchip_add(&pdev->dev, &ip->chip); 224 + ret = devm_pwmchip_add(&pdev->dev, chip); 224 225 if (ret < 0) 225 226 return dev_err_probe(&pdev->dev, ret, 226 227 "failed to add PWM chip\n");