Skip to contentSkip to conversation

fbdev: ssd1307fb: Drop optional dependency

PATCH In review Andy Shevchenko 2 participants 3 messages Nov 1, 2022 Framebuffer layer

lore
Share & tools
lore
#1 lore raw

PATCH 2/2 fbdev: ssd1307fb: Drop duplicate NULL checks for PWM APIs

In reply to Andy Shevchenko

pwm_disable() and pwm_put() are NULL-aware, no need to duplicate the check in the caller.

---
 drivers/video/fbdev/ssd1307fb.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/video/fbdev/ssd1307fb.c +4 -8
index 5c891aa00d59..046b9990d27c 100644
@@ -803,10 +803,8 @@ static int ssd1307fb_probe(struct i2c_client *client)
 bl_init_error:
 	unregister_framebuffer(info);
 panel_init_error:
-	if (par->device_info->need_pwm) {
-		pwm_disable(par->pwm);
-		pwm_put(par->pwm);
-	}
+	pwm_disable(par->pwm);
+	pwm_put(par->pwm);
 regulator_enable_error:
 	if (par->vbat_reg)
 		regulator_disable(par->vbat_reg);
@@ -827,10 +825,8 @@ static void ssd1307fb_remove(struct i2c_client *client)
 	backlight_device_unregister(info->bl_dev);
 
 	unregister_framebuffer(info);
-	if (par->device_info->need_pwm) {
-		pwm_disable(par->pwm);
-		pwm_put(par->pwm);
-	}
+	pwm_disable(par->pwm);
+	pwm_put(par->pwm);
 	if (par->vbat_reg)
 		regulator_disable(par->vbat_reg);
 	fb_deferred_io_cleanup(info);
Signature · 1 line
2.35.1
#0 lore raw

PATCH 1/2 fbdev: ssd1307fb: Drop optional dependency

Only a single out of three devices need a PWM, so from driver it's optional. Moreover it's a single driver in the entire kernel that currently selects PWM. Unfortunately this selection is a root cause of the circular dependencies when we want to enable optional PWM for some other drivers that select GPIOLIB.

Fixes a2ed00da5047 ("drivers/video: add support for the Solomon SSD1307 OLED Controller")
---
 drivers/video/fbdev/Kconfig | 1 -
 1 file changed, 1 deletion(-)
drivers/video/fbdev/Kconfig +0 -1
index a98987aa2784..b88d8bfe992e 100644
@@ -2218,7 +2218,6 @@ config FB_SSD1307
 	select FB_SYS_COPYAREA
 	select FB_SYS_IMAGEBLIT
 	select FB_DEFERRED_IO
-	select PWM
 	select FB_BACKLIGHT
 	help
 	  This driver implements support for the Solomon SSD1307
Signature · 1 line
2.35.1
maintainer
#2 lore raw
Quoted 8 lines · Andy Shevchenko

Only a single out of three devices need a PWM, so from driver it's optional. Moreover it's a single driver in the entire kernel that currently selects PWM. Unfortunately this selection is a root cause of the circular dependencies when we want to enable optional PWM for some other drivers that select GPIOLIB.

Fixes a2ed00da5047 ("drivers/video: add support for the Solomon SSD1307 OLED Controller")

Both patches applied to fbdev git tree.

Thanks!
Helge

Quoted 16 lines
---
  drivers/video/fbdev/Kconfig | 1 -
  1 file changed, 1 deletion(-)
drivers/video/fbdev/Kconfig +0 -1
index a98987aa2784..b88d8bfe992e 100644
@@ -2218,7 +2218,6 @@ config FB_SSD1307
  	select FB_SYS_COPYAREA
  	select FB_SYS_IMAGEBLIT
  	select FB_DEFERRED_IO
-	select PWM
  	select FB_BACKLIGHT
  	help
  	  This driver implements support for the Solomon SSD1307