public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-11-01 09:13:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

pwm: lpss-*: Make use of devm_pwmchip_alloc() function

Browse source 
This prepares the pwm-lpss drivers 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.

Reviewed-by: Andy Shevchenko <andy@kernel.org>
Link: https://lore.kernel.org/r/b567ab5dd992e361eb884fa6c2cac11be9c7dde3.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:31:54 +01:00
parent 11265c637e
commit 05013062a8
6 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/pinctrl/intel/pinctrl-intel.c
View file

@ -1492,7 +1492,7 @@ static int intel_pinctrl_probe_pwm(struct intel_pinctrl *pctrl,
.base_unit_bits = 22, .base_unit_bits = 22,
.bypass = true, .bypass = true,
}; };
struct pwm_lpss_chip *pwm; struct pwm_chip *chip;
if (!(community->features & PINCTRL_FEATURE_PWM)) if (!(community->features & PINCTRL_FEATURE_PWM))
return 0; return 0;
@ -1500,8 +1500,8 @@ static int intel_pinctrl_probe_pwm(struct intel_pinctrl *pctrl,
if (!IS_REACHABLE(CONFIG_PWM_LPSS)) if (!IS_REACHABLE(CONFIG_PWM_LPSS))
return 0; return 0;
pwm = devm_pwm_lpss_probe(pctrl->dev, community->regs + PWMC, &info); chip = devm_pwm_lpss_probe(pctrl->dev, community->regs + PWMC, &info);
return PTR_ERR_OR_ZERO(pwm); return PTR_ERR_OR_ZERO(chip);
} }
int intel_pinctrl_probe(struct platform_device *pdev, int intel_pinctrl_probe(struct platform_device *pdev,

8
drivers/pwm/pwm-lpss-pci.c
View file

@ -18,7 +18,7 @@ static int pwm_lpss_probe_pci(struct pci_dev *pdev,
const struct pci_device_id *id) const struct pci_device_id *id)
{ {
const struct pwm_lpss_boardinfo *info; const struct pwm_lpss_boardinfo *info;
struct pwm_lpss_chip *lpwm; struct pwm_chip *chip;
int err; int err;
err = pcim_enable_device(pdev); err = pcim_enable_device(pdev);
@ -30,9 +30,9 @@ static int pwm_lpss_probe_pci(struct pci_dev *pdev,
return err; return err;
info = (struct pwm_lpss_boardinfo *)id->driver_data; info = (struct pwm_lpss_boardinfo *)id->driver_data;
lpwm = devm_pwm_lpss_probe(&pdev->dev, pcim_iomap_table(pdev)[0], info); chip = devm_pwm_lpss_probe(&pdev->dev, pcim_iomap_table(pdev)[0], info);
if (IS_ERR(lpwm)) if (IS_ERR(chip))
return PTR_ERR(lpwm); return PTR_ERR(chip);
pm_runtime_put(&pdev->dev); pm_runtime_put(&pdev->dev);
pm_runtime_allow(&pdev->dev); pm_runtime_allow(&pdev->dev);

8
drivers/pwm/pwm-lpss-platform.c
View file

@ -20,7 +20,7 @@
static int pwm_lpss_probe_platform(struct platform_device *pdev) static int pwm_lpss_probe_platform(struct platform_device *pdev)
{ {
const struct pwm_lpss_boardinfo *info; const struct pwm_lpss_boardinfo *info;
struct pwm_lpss_chip *lpwm; struct pwm_chip *chip;
void __iomem *base; void __iomem *base;
info = device_get_match_data(&pdev->dev); info = device_get_match_data(&pdev->dev);
@ -31,9 +31,9 @@ static int pwm_lpss_probe_platform(struct platform_device *pdev)
if (IS_ERR(base)) if (IS_ERR(base))
return PTR_ERR(base); return PTR_ERR(base);
lpwm = devm_pwm_lpss_probe(&pdev->dev, base, info); chip = devm_pwm_lpss_probe(&pdev->dev, base, info);
if (IS_ERR(lpwm)) if (IS_ERR(chip))
return PTR_ERR(lpwm); return PTR_ERR(chip);
/* /*
* On Cherry Trail devices the GFX0._PS0 AML checks if the controller * On Cherry Trail devices the GFX0._PS0 AML checks if the controller

22
drivers/pwm/pwm-lpss.c
View file

@ -68,7 +68,7 @@ EXPORT_SYMBOL_GPL(pwm_lpss_tng_info);
static inline struct pwm_lpss_chip *to_lpwm(struct pwm_chip *chip) static inline struct pwm_lpss_chip *to_lpwm(struct pwm_chip *chip)
{ {
return container_of(chip, struct pwm_lpss_chip, chip); return pwmchip_get_drvdata(chip);
} }
static inline u32 pwm_lpss_read(const struct pwm_device *pwm) static inline u32 pwm_lpss_read(const struct pwm_device *pwm)
@ -245,10 +245,11 @@ static const struct pwm_ops pwm_lpss_ops = {
.get_state = pwm_lpss_get_state, .get_state = pwm_lpss_get_state,
}; };
struct pwm_lpss_chip *devm_pwm_lpss_probe(struct device *dev, void __iomem *base, struct pwm_chip *devm_pwm_lpss_probe(struct device *dev, void __iomem *base,
const struct pwm_lpss_boardinfo *info) const struct pwm_lpss_boardinfo *info)
{ {
struct pwm_lpss_chip *lpwm; struct pwm_lpss_chip *lpwm;
struct pwm_chip *chip;
unsigned long c; unsigned long c;
int i, ret; int i, ret;
u32 ctrl; u32 ctrl;
@ -256,9 +257,10 @@ struct pwm_lpss_chip *devm_pwm_lpss_probe(struct device *dev, void __iomem *base
if (WARN_ON(info->npwm > LPSS_MAX_PWMS)) if (WARN_ON(info->npwm > LPSS_MAX_PWMS))
return ERR_PTR(-ENODEV); return ERR_PTR(-ENODEV);
lpwm = devm_kzalloc(dev, sizeof(*lpwm), GFP_KERNEL); chip = devm_pwmchip_alloc(dev, info->npwm, sizeof(*lpwm));
if (!lpwm) if (IS_ERR(chip))
return ERR_PTR(-ENOMEM); return chip;
lpwm = to_lpwm(chip);
lpwm->regs = base; lpwm->regs = base;
lpwm->info = info; lpwm->info = info;
@ -267,23 +269,21 @@ struct pwm_lpss_chip *devm_pwm_lpss_probe(struct device *dev, void __iomem *base
if (!c) if (!c)
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
lpwm->chip.dev = dev; chip->ops = &pwm_lpss_ops;
lpwm->chip.ops = &pwm_lpss_ops;
lpwm->chip.npwm = info->npwm;
ret = devm_pwmchip_add(dev, &lpwm->chip); ret = devm_pwmchip_add(dev, chip);
if (ret) { if (ret) {
dev_err(dev, "failed to add PWM chip: %d\n", ret); dev_err(dev, "failed to add PWM chip: %d\n", ret);
return ERR_PTR(ret); return ERR_PTR(ret);
} }
for (i = 0; i < lpwm->info->npwm; i++) { for (i = 0; i < lpwm->info->npwm; i++) {
ctrl = pwm_lpss_read(&lpwm->chip.pwms[i]); ctrl = pwm_lpss_read(&chip->pwms[i]);
if (ctrl & PWM_ENABLE) if (ctrl & PWM_ENABLE)
pm_runtime_get(dev); pm_runtime_get(dev);
} }
return lpwm; return chip;
} }
EXPORT_SYMBOL_GPL(devm_pwm_lpss_probe); EXPORT_SYMBOL_GPL(devm_pwm_lpss_probe);

1
drivers/pwm/pwm-lpss.h
View file

@ -18,7 +18,6 @@
#define LPSS_MAX_PWMS 4 #define LPSS_MAX_PWMS 4
struct pwm_lpss_chip { struct pwm_lpss_chip {
struct pwm_chip chip;
void __iomem *regs; void __iomem *regs;
const struct pwm_lpss_boardinfo *info; const struct pwm_lpss_boardinfo *info;
}; };

2
include/linux/platform_data/x86/pwm-lpss.h
View file

@ -27,7 +27,7 @@ struct pwm_lpss_boardinfo {
bool other_devices_aml_touches_pwm_regs; bool other_devices_aml_touches_pwm_regs;
}; };
struct pwm_lpss_chip *devm_pwm_lpss_probe(struct device *dev, void __iomem *base, struct pwm_chip *devm_pwm_lpss_probe(struct device *dev, void __iomem *base,
const struct pwm_lpss_boardinfo *info); const struct pwm_lpss_boardinfo *info);
#endif /* __PLATFORM_DATA_X86_PWM_LPSS_H */ #endif /* __PLATFORM_DATA_X86_PWM_LPSS_H */