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

pwm: lpss: Simplify using devm_pwmchip_add()

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>

authored by

Uwe Kleine-König and committed by
Thierry Reding
d1e487b7 bcda91bf

+2 -15
-4
drivers/pwm/pwm-lpss-pci.c
··· 69 69 70 70 static void pwm_lpss_remove_pci(struct pci_dev *pdev) 71 71 { 72 - struct pwm_lpss_chip *lpwm = pci_get_drvdata(pdev); 73 - 74 72 pm_runtime_forbid(&pdev->dev); 75 73 pm_runtime_get_sync(&pdev->dev); 76 - 77 - pwm_lpss_remove(lpwm); 78 74 } 79 75 80 76 #ifdef CONFIG_PM
+1 -3
drivers/pwm/pwm-lpss-platform.c
··· 85 85 86 86 static int pwm_lpss_remove_platform(struct platform_device *pdev) 87 87 { 88 - struct pwm_lpss_chip *lpwm = platform_get_drvdata(pdev); 89 - 90 88 pm_runtime_disable(&pdev->dev); 91 - return pwm_lpss_remove(lpwm); 89 + return 0; 92 90 } 93 91 94 92 static const struct acpi_device_id pwm_lpss_acpi_match[] = {
+1 -7
drivers/pwm/pwm-lpss.c
··· 236 236 lpwm->chip.ops = &pwm_lpss_ops; 237 237 lpwm->chip.npwm = info->npwm; 238 238 239 - ret = pwmchip_add(&lpwm->chip); 239 + ret = devm_pwmchip_add(dev, &lpwm->chip); 240 240 if (ret) { 241 241 dev_err(dev, "failed to add PWM chip: %d\n", ret); 242 242 return ERR_PTR(ret); ··· 251 251 return lpwm; 252 252 } 253 253 EXPORT_SYMBOL_GPL(pwm_lpss_probe); 254 - 255 - int pwm_lpss_remove(struct pwm_lpss_chip *lpwm) 256 - { 257 - return pwmchip_remove(&lpwm->chip); 258 - } 259 - EXPORT_SYMBOL_GPL(pwm_lpss_remove); 260 254 261 255 MODULE_DESCRIPTION("PWM driver for Intel LPSS"); 262 256 MODULE_AUTHOR("Mika Westerberg <mika.westerberg@linux.intel.com>");
-1
drivers/pwm/pwm-lpss.h
··· 35 35 36 36 struct pwm_lpss_chip *pwm_lpss_probe(struct device *dev, struct resource *r, 37 37 const struct pwm_lpss_boardinfo *info); 38 - int pwm_lpss_remove(struct pwm_lpss_chip *lpwm); 39 38 40 39 #endif /* __PWM_LPSS_H */