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: Thierry Reding <thierry.reding@gmail.com>

diff --git a/drivers/pwm/pwm-atmel-hlcdc.c b/drivers/pwm/pwm-atmel-hlcdc.c
index 14fc011faa32fee990c7ab9253d5faabe67465d4..999187277ea56fd603993680a8c7f8ecb9effd15 100644 (file)
--- a/drivers/pwm/pwm-atmel-hlcdc.c
+++ b/drivers/pwm/pwm-atmel-hlcdc.c
@@ -270,7 +270,6 @@ static int atmel_hlcdc_pwm_probe(struct platform_device *pdev)
        chip->chip.npwm = 1;
        chip->chip.of_xlate = of_pwm_xlate_with_flags;
        chip->chip.of_pwm_n_cells = 3;
-       chip->chip.can_sleep = 1;
 
        ret = pwmchip_add_with_polarity(&chip->chip, PWM_POLARITY_INVERSED);
        if (ret) {

diff --git a/drivers/pwm/pwm-atmel.c b/drivers/pwm/pwm-atmel.c
index e6b8b1b7e6ba7ddcbb2fa6142b2ba33ff0af777e..67a7023be5c2b54bb35eb70eb94be07aaa471432 100644 (file)
--- a/drivers/pwm/pwm-atmel.c
+++ b/drivers/pwm/pwm-atmel.c
@@ -385,7 +385,6 @@ static int atmel_pwm_probe(struct platform_device *pdev)
 
        atmel_pwm->chip.base = -1;
        atmel_pwm->chip.npwm = 4;
-       atmel_pwm->chip.can_sleep = true;
        atmel_pwm->config = data->config;
        atmel_pwm->updated_pwms = 0;
        mutex_init(&atmel_pwm->isr_lock);

diff --git a/drivers/pwm/pwm-bcm-kona.c b/drivers/pwm/pwm-bcm-kona.c
index c634183220232194c3a0192121681c5610feb809..09a95aeb3a70ff79bb11819126ac5874f2d4a909 100644 (file)
--- a/drivers/pwm/pwm-bcm-kona.c
+++ b/drivers/pwm/pwm-bcm-kona.c
@@ -276,7 +276,6 @@ static int kona_pwmc_probe(struct platform_device *pdev)
        kp->chip.npwm = 6;
        kp->chip.of_xlate = of_pwm_xlate_with_flags;
        kp->chip.of_pwm_n_cells = 3;
-       kp->chip.can_sleep = true;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        kp->base = devm_ioremap_resource(&pdev->dev, res);

diff --git a/drivers/pwm/pwm-berlin.c b/drivers/pwm/pwm-berlin.c
index 01339c152ab00bb69b4ff1ee0c87c096151bd91c..771859aca4be2b104e53f57f1271e8a2c7a9677d 100644 (file)
--- a/drivers/pwm/pwm-berlin.c
+++ b/drivers/pwm/pwm-berlin.c
@@ -206,7 +206,6 @@ static int berlin_pwm_probe(struct platform_device *pdev)
        pwm->chip.ops = &berlin_pwm_ops;
        pwm->chip.base = -1;
        pwm->chip.npwm = 4;
-       pwm->chip.can_sleep = true;
        pwm->chip.of_xlate = of_pwm_xlate_with_flags;
        pwm->chip.of_pwm_n_cells = 3;
 

diff --git a/drivers/pwm/pwm-brcmstb.c b/drivers/pwm/pwm-brcmstb.c
index 5d5adee1688624ed4123ae9f6fbb821e6e337364..8063cffa1c96031ef7c24cff02086a99e25b96b3 100644 (file)
--- a/drivers/pwm/pwm-brcmstb.c
+++ b/drivers/pwm/pwm-brcmstb.c
@@ -270,7 +270,6 @@ static int brcmstb_pwm_probe(struct platform_device *pdev)
        p->chip.ops = &brcmstb_pwm_ops;
        p->chip.base = -1;
        p->chip.npwm = 2;
-       p->chip.can_sleep = true;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        p->base = devm_ioremap_resource(&pdev->dev, res);

diff --git a/drivers/pwm/pwm-fsl-ftm.c b/drivers/pwm/pwm-fsl-ftm.c
index fad968eb75f628a8a40abeb62ccc08c61b3d435c..557b4ea16796bff9f18e7919bf6a07bc0dfcc3c2 100644 (file)
--- a/drivers/pwm/pwm-fsl-ftm.c
+++ b/drivers/pwm/pwm-fsl-ftm.c
@@ -446,7 +446,6 @@ static int fsl_pwm_probe(struct platform_device *pdev)
        fpc->chip.of_pwm_n_cells = 3;
        fpc->chip.base = -1;
        fpc->chip.npwm = 8;
-       fpc->chip.can_sleep = true;
 
        ret = pwmchip_add(&fpc->chip);
        if (ret < 0) {

diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
index d600fd5cd4bac9a434a20798328d513d89b5452f..1223187ad354099a70b562a1173ab6149fba74a6 100644 (file)
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -304,7 +304,6 @@ static int imx_pwm_probe(struct platform_device *pdev)
        imx->chip.dev = &pdev->dev;
        imx->chip.base = -1;
        imx->chip.npwm = 1;
-       imx->chip.can_sleep = true;
 
        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        imx->mmio_base = devm_ioremap_resource(&pdev->dev, r);

diff --git a/drivers/pwm/pwm-lp3943.c b/drivers/pwm/pwm-lp3943.c
index 872ea76a4f1904059972e3430e2650171be9bb9e..52584e9962edd43adf83d9da04fc2e16672fcc87 100644 (file)
--- a/drivers/pwm/pwm-lp3943.c
+++ b/drivers/pwm/pwm-lp3943.c
@@ -278,7 +278,6 @@ static int lp3943_pwm_probe(struct platform_device *pdev)
        lp3943_pwm->chip.dev = &pdev->dev;
        lp3943_pwm->chip.ops = &lp3943_pwm_ops;
        lp3943_pwm->chip.npwm = LP3943_NUM_PWMS;
-       lp3943_pwm->chip.can_sleep = true;
 
        platform_set_drvdata(pdev, lp3943_pwm);
 

diff --git a/drivers/pwm/pwm-mxs.c b/drivers/pwm/pwm-mxs.c
index 9a596324ebef8a1bede6324083aefc7315520c44..a6017ad9926c60a2cc0df8edfd36e2acef8c54cf 100644 (file)
--- a/drivers/pwm/pwm-mxs.c
+++ b/drivers/pwm/pwm-mxs.c
@@ -151,7 +151,7 @@ static int mxs_pwm_probe(struct platform_device *pdev)
        mxs->chip.dev = &pdev->dev;
        mxs->chip.ops = &mxs_pwm_ops;
        mxs->chip.base = -1;
-       mxs->chip.can_sleep = true;
+
        ret = of_property_read_u32(np, "fsl,pwm-number", &mxs->chip.npwm);
        if (ret < 0) {
                dev_err(&pdev->dev, "failed to get pwm number: %d\n", ret);

diff --git a/drivers/pwm/pwm-pca9685.c b/drivers/pwm/pwm-pca9685.c
index 117fccf7934a73a3c4098d809ff72bb9bef8006a..c8282a2650be897557a83e361d7e3bb1d1a6ed90 100644 (file)
--- a/drivers/pwm/pwm-pca9685.c
+++ b/drivers/pwm/pwm-pca9685.c
@@ -343,7 +343,6 @@ static int pca9685_pwm_probe(struct i2c_client *client,
 
        pca->chip.dev = &client->dev;
        pca->chip.base = -1;
-       pca->chip.can_sleep = true;
 
        return pwmchip_add(&pca->chip);
 }

diff --git a/drivers/pwm/pwm-sti.c b/drivers/pwm/pwm-sti.c
index dd82dc840af98b3b4a039b60054b666d5de8d5b6..2b7c31c9d1ab28a66056d9b28b809bef67a905bb 100644 (file)
--- a/drivers/pwm/pwm-sti.c
+++ b/drivers/pwm/pwm-sti.c
@@ -635,7 +635,6 @@ skip_cpt:
        pc->chip.ops = &sti_pwm_ops;
        pc->chip.base = -1;
        pc->chip.npwm = pc->cdata->pwm_num_devs;
-       pc->chip.can_sleep = true;
 
        ret = pwmchip_add(&pc->chip);
        if (ret < 0) {

diff --git a/drivers/pwm/pwm-sun4i.c b/drivers/pwm/pwm-sun4i.c
index b0803f6c64d9200909fdebec0752b2060a436df8..1284ffa05921f81a404581bc8fc456c17a9451f8 100644 (file)
--- a/drivers/pwm/pwm-sun4i.c
+++ b/drivers/pwm/pwm-sun4i.c
@@ -340,7 +340,6 @@ static int sun4i_pwm_probe(struct platform_device *pdev)
        pwm->chip.ops = &sun4i_pwm_ops;
        pwm->chip.base = -1;
        pwm->chip.npwm = pwm->data->npwm;
-       pwm->chip.can_sleep = true;
        pwm->chip.of_xlate = of_pwm_xlate_with_flags;
        pwm->chip.of_pwm_n_cells = 3;
 

diff --git a/drivers/pwm/pwm-twl-led.c b/drivers/pwm/pwm-twl-led.c
index b964470025c5e288a6009817ddb683c679868eb6..21eff991d0e355b68e10a0e28aa8c09116fb38da 100644 (file)
--- a/drivers/pwm/pwm-twl-led.c
+++ b/drivers/pwm/pwm-twl-led.c
@@ -303,7 +303,6 @@ static int twl_pwmled_probe(struct platform_device *pdev)
 
        twl->chip.dev = &pdev->dev;
        twl->chip.base = -1;
-       twl->chip.can_sleep = true;
 
        mutex_init(&twl->mutex);
 

diff --git a/drivers/pwm/pwm-twl.c b/drivers/pwm/pwm-twl.c
index 7a993b0566383c38358bbf17784d30221c051749..9de617b766801b58855584015481945d32092c58 100644 (file)
--- a/drivers/pwm/pwm-twl.c
+++ b/drivers/pwm/pwm-twl.c
@@ -323,7 +323,6 @@ static int twl_pwm_probe(struct platform_device *pdev)
        twl->chip.dev = &pdev->dev;
        twl->chip.base = -1;
        twl->chip.npwm = 2;
-       twl->chip.can_sleep = true;
 
        mutex_init(&twl->mutex);
 

diff --git a/drivers/staging/greybus/pwm.c b/drivers/staging/greybus/pwm.c
index c4bf3298ba0747c70e3c2189454fb9e01ae1e641..f0404bc37123da587d3ecf39f96cfc3c6e60bda2 100644 (file)
--- a/drivers/staging/greybus/pwm.c
+++ b/drivers/staging/greybus/pwm.c
@@ -284,7 +284,6 @@ static int gb_pwm_probe(struct gbphy_device *gbphy_dev,
        pwm->ops = &gb_pwm_ops;
        pwm->base = -1;                 /* Allocate base dynamically */
        pwm->npwm = pwmc->pwm_max + 1;
-       pwm->can_sleep = true;          /* FIXME */
 
        ret = pwmchip_add(pwm);
        if (ret) {

diff --git a/include/linux/pwm.h b/include/linux/pwm.h
index e15fd3ce6502de9ec133ffc089427b1f84252ad6..eae215ef1b2cc9036db0df5cd73b60d8708418d8 100644 (file)
--- a/include/linux/pwm.h
+++ b/include/linux/pwm.h
@@ -287,8 +287,6 @@ struct pwm_ops {
  * @pwms: array of PWM devices allocated by the framework
  * @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
- * @can_sleep: must be true if the .config(), .enable() or .disable()
- *             operations may sleep
  */
 struct pwm_chip {
        struct device *dev;
@@ -302,7 +300,6 @@ struct pwm_chip {
        struct pwm_device * (*of_xlate)(struct pwm_chip *pc,
                                        const struct of_phandle_args *args);
        unsigned int of_pwm_n_cells;
-       bool can_sleep;
 };
 
 /**