diff mbox series

[3/3] video: fbdev: ssd1307fb: Switch to atomic PWM API

Message ID 1589316769-13277-3-git-send-email-alencar.fmce@imbel.gov.br (mailing list archive)
State Superseded, archived
Headers show
Series [1/3] video: fbdev: ssd1307fb: Added support to Column offset | expand

Commit Message

Rodrigo Alencar May 12, 2020, 8:52 p.m. UTC 
Signed-off-by: Rodrigo Rolim Mendes de Alencar <alencar.fmce@imbel.gov.br>
---
 drivers/video/fbdev/ssd1307fb.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)
diff mbox series

Patch

diff --git a/drivers/video/fbdev/ssd1307fb.c b/drivers/video/fbdev/ssd1307fb.c
index 748c21c0567b..b1cac4a3722f 100644
--- a/drivers/video/fbdev/ssd1307fb.c
+++ b/drivers/video/fbdev/ssd1307fb.c
@@ -303,7 +303,7 @@  static int ssd1307fb_init(struct ssd1307fb_par *par)
 {
 	int ret;
 	u32 precharge, dclk, com_invdir, compins;
-	struct pwm_args pargs;
+	struct pwm_state pstate;
 
 	if (par->device_info->need_pwm) {
 		par->pwm = pwm_get(&par->client->dev, NULL);
@@ -312,18 +312,18 @@  static int ssd1307fb_init(struct ssd1307fb_par *par)
 			return PTR_ERR(par->pwm);
 		}
 
-		/*
-		 * FIXME: pwm_apply_args() should be removed when switching to
-		 * the atomic PWM API.
-		 */
-		pwm_apply_args(par->pwm);
+		pwm_init_state(par->pwm, &pstate);
+		par->pwm_period = pstate.period;
 
-		pwm_get_args(par->pwm, &pargs);
-
-		par->pwm_period = pargs.period;
 		/* Enable the PWM */
-		pwm_config(par->pwm, par->pwm_period / 2, par->pwm_period);
-		pwm_enable(par->pwm);
+		pstate.enabled = true;
+		pstate.duty_cycle = pstate.period / 2;
+
+		ret = pwm_apply_state(par->pwm, &pstate);
+		if (ret) {
+			dev_err(&par->client->dev, "Failed to apply PWM state: %d\n", ret);
+			return ret;
+		}
 
 		dev_dbg(&par->client->dev, "Using PWM%d with a %dns period.\n",
 			par->pwm->pwm, par->pwm_period);