platform/x86: amd-pmc: Move to later in the suspend process

[linux.git] / drivers / pwm / pwm-pxa.c

diff --git a/drivers/pwm/pwm-pxa.c b/drivers/pwm/pwm-pxa.c
index a9efdcf839ae817a20fd9618cc05b9415583ea7f..238ec88c130bb76ba5f226752391aa12e7f0923d 100644 (file)
--- a/drivers/pwm/pwm-pxa.c
+++ b/drivers/pwm/pwm-pxa.c
@@ -148,20 +148,6 @@ static const struct platform_device_id *pxa_pwm_get_id_dt(struct device *dev)
        return id ? id->data : NULL;
 }
 
        return id ? id->data : NULL;
 }
 

-static struct pwm_device *
-pxa_pwm_of_xlate(struct pwm_chip *pc, const struct of_phandle_args *args)
-{
-       struct pwm_device *pwm;
-
-       pwm = pwm_request_from_chip(pc, 0, NULL);
-       if (IS_ERR(pwm))
-               return pwm;
-
-       pwm->args.period = args->args[0];
-
-       return pwm;
-}
-

 static int pwm_probe(struct platform_device *pdev)
 {
        const struct platform_device_id *id = platform_get_device_id(pdev);
 static int pwm_probe(struct platform_device *pdev)
 {
        const struct platform_device_id *id = platform_get_device_id(pdev);


@@ -187,7 +173,7 @@ static int pwm_probe(struct platform_device *pdev)
        pc->chip.npwm = (id->driver_data & HAS_SECONDARY_PWM) ? 2 : 1;
 
        if (IS_ENABLED(CONFIG_OF)) {
        pc->chip.npwm = (id->driver_data & HAS_SECONDARY_PWM) ? 2 : 1;
 
        if (IS_ENABLED(CONFIG_OF)) {

-               pc->chip.of_xlate = pxa_pwm_of_xlate;
+               pc->chip.of_xlate = of_pwm_single_xlate;

                pc->chip.of_pwm_n_cells = 1;
        }
 
                pc->chip.of_pwm_n_cells = 1;
        }