Commit d1e487b7 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Thierry Reding
Browse files

pwm: lpss: Simplify using devm_pwmchip_add() 



Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent bcda91bf

drivers/pwm/pwm-lpss-pci.c

+0 −4
Original line number Diff line number Diff line
@@ -69,12 +69,8 @@ static int pwm_lpss_probe_pci(struct pci_dev *pdev, 


static void pwm_lpss_remove_pci(struct pci_dev *pdev)

{

	struct pwm_lpss_chip *lpwm = pci_get_drvdata(pdev);



	pm_runtime_forbid(&pdev->dev);

	pm_runtime_get_sync(&pdev->dev);



	pwm_lpss_remove(lpwm);

}



#ifdef CONFIG_PM

drivers/pwm/pwm-lpss-platform.c

+1 −3
Original line number Diff line number Diff line
@@ -85,10 +85,8 @@ static int pwm_lpss_probe_platform(struct platform_device *pdev) 


static int pwm_lpss_remove_platform(struct platform_device *pdev)

{

	struct pwm_lpss_chip *lpwm = platform_get_drvdata(pdev);



	pm_runtime_disable(&pdev->dev);

	return pwm_lpss_remove(lpwm);

	return 0;

}



static const struct acpi_device_id pwm_lpss_acpi_match[] = {

drivers/pwm/pwm-lpss.c

+1 −7
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ struct pwm_lpss_chip *pwm_lpss_probe(struct device *dev, struct resource *r, 
	lpwm->chip.ops = &pwm_lpss_ops;

	lpwm->chip.npwm = info->npwm;



	ret = pwmchip_add(&lpwm->chip);

	ret = devm_pwmchip_add(dev, &lpwm->chip);

	if (ret) {

		dev_err(dev, "failed to add PWM chip: %d\n", ret);

		return ERR_PTR(ret);
@@ -252,12 +252,6 @@ struct pwm_lpss_chip *pwm_lpss_probe(struct device *dev, struct resource *r, 
}

EXPORT_SYMBOL_GPL(pwm_lpss_probe);



int pwm_lpss_remove(struct pwm_lpss_chip *lpwm)

{

	return pwmchip_remove(&lpwm->chip);

}

EXPORT_SYMBOL_GPL(pwm_lpss_remove);



MODULE_DESCRIPTION("PWM driver for Intel LPSS");

MODULE_AUTHOR("Mika Westerberg <mika.westerberg@linux.intel.com>");

MODULE_LICENSE("GPL v2");

drivers/pwm/pwm-lpss.h

+0 −1
Original line number Diff line number Diff line
@@ -35,6 +35,5 @@ struct pwm_lpss_boardinfo { 


struct pwm_lpss_chip *pwm_lpss_probe(struct device *dev, struct resource *r,

				     const struct pwm_lpss_boardinfo *info);

int pwm_lpss_remove(struct pwm_lpss_chip *lpwm);



#endif	/* __PWM_LPSS_H */