Commit 8c0216f3 authored by Thierry Reding's avatar Thierry Reding

pwm: Remove .can_sleep from struct pwm_chip

All PWM devices have been marked as "might sleep" since v4.5, there is
no longer a need to differentiate on a per-chip basis.
Signed-off-by: default avatarThierry Reding <thierry.reding@gmail.com>
parent fe2858c8
...@@ -270,7 +270,6 @@ static int atmel_hlcdc_pwm_probe(struct platform_device *pdev) ...@@ -270,7 +270,6 @@ static int atmel_hlcdc_pwm_probe(struct platform_device *pdev)
chip->chip.npwm = 1; chip->chip.npwm = 1;
chip->chip.of_xlate = of_pwm_xlate_with_flags; chip->chip.of_xlate = of_pwm_xlate_with_flags;
chip->chip.of_pwm_n_cells = 3; chip->chip.of_pwm_n_cells = 3;
chip->chip.can_sleep = 1;
ret = pwmchip_add_with_polarity(&chip->chip, PWM_POLARITY_INVERSED); ret = pwmchip_add_with_polarity(&chip->chip, PWM_POLARITY_INVERSED);
if (ret) { if (ret) {
......
...@@ -385,7 +385,6 @@ static int atmel_pwm_probe(struct platform_device *pdev) ...@@ -385,7 +385,6 @@ static int atmel_pwm_probe(struct platform_device *pdev)
atmel_pwm->chip.base = -1; atmel_pwm->chip.base = -1;
atmel_pwm->chip.npwm = 4; atmel_pwm->chip.npwm = 4;
atmel_pwm->chip.can_sleep = true;
atmel_pwm->config = data->config; atmel_pwm->config = data->config;
atmel_pwm->updated_pwms = 0; atmel_pwm->updated_pwms = 0;
mutex_init(&atmel_pwm->isr_lock); mutex_init(&atmel_pwm->isr_lock);
......
...@@ -276,7 +276,6 @@ static int kona_pwmc_probe(struct platform_device *pdev) ...@@ -276,7 +276,6 @@ static int kona_pwmc_probe(struct platform_device *pdev)
kp->chip.npwm = 6; kp->chip.npwm = 6;
kp->chip.of_xlate = of_pwm_xlate_with_flags; kp->chip.of_xlate = of_pwm_xlate_with_flags;
kp->chip.of_pwm_n_cells = 3; kp->chip.of_pwm_n_cells = 3;
kp->chip.can_sleep = true;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
kp->base = devm_ioremap_resource(&pdev->dev, res); kp->base = devm_ioremap_resource(&pdev->dev, res);
......
...@@ -206,7 +206,6 @@ static int berlin_pwm_probe(struct platform_device *pdev) ...@@ -206,7 +206,6 @@ static int berlin_pwm_probe(struct platform_device *pdev)
pwm->chip.ops = &berlin_pwm_ops; pwm->chip.ops = &berlin_pwm_ops;
pwm->chip.base = -1; pwm->chip.base = -1;
pwm->chip.npwm = 4; pwm->chip.npwm = 4;
pwm->chip.can_sleep = true;
pwm->chip.of_xlate = of_pwm_xlate_with_flags; pwm->chip.of_xlate = of_pwm_xlate_with_flags;
pwm->chip.of_pwm_n_cells = 3; pwm->chip.of_pwm_n_cells = 3;
......
...@@ -270,7 +270,6 @@ static int brcmstb_pwm_probe(struct platform_device *pdev) ...@@ -270,7 +270,6 @@ static int brcmstb_pwm_probe(struct platform_device *pdev)
p->chip.ops = &brcmstb_pwm_ops; p->chip.ops = &brcmstb_pwm_ops;
p->chip.base = -1; p->chip.base = -1;
p->chip.npwm = 2; p->chip.npwm = 2;
p->chip.can_sleep = true;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
p->base = devm_ioremap_resource(&pdev->dev, res); p->base = devm_ioremap_resource(&pdev->dev, res);
......
...@@ -446,7 +446,6 @@ static int fsl_pwm_probe(struct platform_device *pdev) ...@@ -446,7 +446,6 @@ static int fsl_pwm_probe(struct platform_device *pdev)
fpc->chip.of_pwm_n_cells = 3; fpc->chip.of_pwm_n_cells = 3;
fpc->chip.base = -1; fpc->chip.base = -1;
fpc->chip.npwm = 8; fpc->chip.npwm = 8;
fpc->chip.can_sleep = true;
ret = pwmchip_add(&fpc->chip); ret = pwmchip_add(&fpc->chip);
if (ret < 0) { if (ret < 0) {
......
...@@ -304,7 +304,6 @@ static int imx_pwm_probe(struct platform_device *pdev) ...@@ -304,7 +304,6 @@ static int imx_pwm_probe(struct platform_device *pdev)
imx->chip.dev = &pdev->dev; imx->chip.dev = &pdev->dev;
imx->chip.base = -1; imx->chip.base = -1;
imx->chip.npwm = 1; imx->chip.npwm = 1;
imx->chip.can_sleep = true;
r = platform_get_resource(pdev, IORESOURCE_MEM, 0); r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
imx->mmio_base = devm_ioremap_resource(&pdev->dev, r); imx->mmio_base = devm_ioremap_resource(&pdev->dev, r);
......
...@@ -278,7 +278,6 @@ static int lp3943_pwm_probe(struct platform_device *pdev) ...@@ -278,7 +278,6 @@ static int lp3943_pwm_probe(struct platform_device *pdev)
lp3943_pwm->chip.dev = &pdev->dev; lp3943_pwm->chip.dev = &pdev->dev;
lp3943_pwm->chip.ops = &lp3943_pwm_ops; lp3943_pwm->chip.ops = &lp3943_pwm_ops;
lp3943_pwm->chip.npwm = LP3943_NUM_PWMS; lp3943_pwm->chip.npwm = LP3943_NUM_PWMS;
lp3943_pwm->chip.can_sleep = true;
platform_set_drvdata(pdev, lp3943_pwm); platform_set_drvdata(pdev, lp3943_pwm);
......
...@@ -151,7 +151,7 @@ static int mxs_pwm_probe(struct platform_device *pdev) ...@@ -151,7 +151,7 @@ static int mxs_pwm_probe(struct platform_device *pdev)
mxs->chip.dev = &pdev->dev; mxs->chip.dev = &pdev->dev;
mxs->chip.ops = &mxs_pwm_ops; mxs->chip.ops = &mxs_pwm_ops;
mxs->chip.base = -1; mxs->chip.base = -1;
mxs->chip.can_sleep = true;
ret = of_property_read_u32(np, "fsl,pwm-number", &mxs->chip.npwm); ret = of_property_read_u32(np, "fsl,pwm-number", &mxs->chip.npwm);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "failed to get pwm number: %d\n", ret); dev_err(&pdev->dev, "failed to get pwm number: %d\n", ret);
......
...@@ -343,7 +343,6 @@ static int pca9685_pwm_probe(struct i2c_client *client, ...@@ -343,7 +343,6 @@ static int pca9685_pwm_probe(struct i2c_client *client,
pca->chip.dev = &client->dev; pca->chip.dev = &client->dev;
pca->chip.base = -1; pca->chip.base = -1;
pca->chip.can_sleep = true;
return pwmchip_add(&pca->chip); return pwmchip_add(&pca->chip);
} }
......
...@@ -635,7 +635,6 @@ static int sti_pwm_probe(struct platform_device *pdev) ...@@ -635,7 +635,6 @@ static int sti_pwm_probe(struct platform_device *pdev)
pc->chip.ops = &sti_pwm_ops; pc->chip.ops = &sti_pwm_ops;
pc->chip.base = -1; pc->chip.base = -1;
pc->chip.npwm = pc->cdata->pwm_num_devs; pc->chip.npwm = pc->cdata->pwm_num_devs;
pc->chip.can_sleep = true;
ret = pwmchip_add(&pc->chip); ret = pwmchip_add(&pc->chip);
if (ret < 0) { if (ret < 0) {
......
...@@ -340,7 +340,6 @@ static int sun4i_pwm_probe(struct platform_device *pdev) ...@@ -340,7 +340,6 @@ static int sun4i_pwm_probe(struct platform_device *pdev)
pwm->chip.ops = &sun4i_pwm_ops; pwm->chip.ops = &sun4i_pwm_ops;
pwm->chip.base = -1; pwm->chip.base = -1;
pwm->chip.npwm = pwm->data->npwm; pwm->chip.npwm = pwm->data->npwm;
pwm->chip.can_sleep = true;
pwm->chip.of_xlate = of_pwm_xlate_with_flags; pwm->chip.of_xlate = of_pwm_xlate_with_flags;
pwm->chip.of_pwm_n_cells = 3; pwm->chip.of_pwm_n_cells = 3;
......
...@@ -303,7 +303,6 @@ static int twl_pwmled_probe(struct platform_device *pdev) ...@@ -303,7 +303,6 @@ static int twl_pwmled_probe(struct platform_device *pdev)
twl->chip.dev = &pdev->dev; twl->chip.dev = &pdev->dev;
twl->chip.base = -1; twl->chip.base = -1;
twl->chip.can_sleep = true;
mutex_init(&twl->mutex); mutex_init(&twl->mutex);
......
...@@ -323,7 +323,6 @@ static int twl_pwm_probe(struct platform_device *pdev) ...@@ -323,7 +323,6 @@ static int twl_pwm_probe(struct platform_device *pdev)
twl->chip.dev = &pdev->dev; twl->chip.dev = &pdev->dev;
twl->chip.base = -1; twl->chip.base = -1;
twl->chip.npwm = 2; twl->chip.npwm = 2;
twl->chip.can_sleep = true;
mutex_init(&twl->mutex); mutex_init(&twl->mutex);
......
...@@ -284,7 +284,6 @@ static int gb_pwm_probe(struct gbphy_device *gbphy_dev, ...@@ -284,7 +284,6 @@ static int gb_pwm_probe(struct gbphy_device *gbphy_dev,
pwm->ops = &gb_pwm_ops; pwm->ops = &gb_pwm_ops;
pwm->base = -1; /* Allocate base dynamically */ pwm->base = -1; /* Allocate base dynamically */
pwm->npwm = pwmc->pwm_max + 1; pwm->npwm = pwmc->pwm_max + 1;
pwm->can_sleep = true; /* FIXME */
ret = pwmchip_add(pwm); ret = pwmchip_add(pwm);
if (ret) { if (ret) {
......
...@@ -287,8 +287,6 @@ struct pwm_ops { ...@@ -287,8 +287,6 @@ struct pwm_ops {
* @pwms: array of PWM devices allocated by the framework * @pwms: array of PWM devices allocated by the framework
* @of_xlate: request a PWM device given a device tree PWM specifier * @of_xlate: request a PWM device given a device tree PWM specifier
* @of_pwm_n_cells: number of cells expected in the device tree PWM specifier * @of_pwm_n_cells: number of cells expected in the device tree PWM specifier
* @can_sleep: must be true if the .config(), .enable() or .disable()
* operations may sleep
*/ */
struct pwm_chip { struct pwm_chip {
struct device *dev; struct device *dev;
...@@ -302,7 +300,6 @@ struct pwm_chip { ...@@ -302,7 +300,6 @@ struct pwm_chip {
struct pwm_device * (*of_xlate)(struct pwm_chip *pc, struct pwm_device * (*of_xlate)(struct pwm_chip *pc,
const struct of_phandle_args *args); const struct of_phandle_args *args);
unsigned int of_pwm_n_cells; unsigned int of_pwm_n_cells;
bool can_sleep;
}; };
/** /**
......
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