Skip to content

Commit 51affef

Browse files
drm/ssd130x: Silence a dubious: x & !y warning
The sparse tool complains with the following warning: $ make M=drivers/gpu/drm/solomon/ C=2 CC [M] drivers/gpu/drm/solomon/ssd130x.o CHECK drivers/gpu/drm/solomon/ssd130x.c drivers/gpu/drm/solomon/ssd130x.c:363:21: warning: dubious: x & !y This seems to be a false positive in my opinion but still we can silence the tool while making the code easier to read. Let's also add a comment, to explain why the "com_seq" logical not is used rather than its value. Reported-by: Thomas Zimmermann <[email protected]> Signed-off-by: Javier Martinez Canillas <[email protected]> Reviewed-by: Thomas Zimmermann <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 998101f commit 51affef

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

drivers/gpu/drm/solomon/ssd130x.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
#define SSD130X_SET_PRECHARGE_PERIOD2_MASK GENMASK(7, 4)
8282
#define SSD130X_SET_PRECHARGE_PERIOD2_SET(val) FIELD_PREP(SSD130X_SET_PRECHARGE_PERIOD2_MASK, (val))
8383
#define SSD130X_SET_COM_PINS_CONFIG1_MASK GENMASK(4, 4)
84-
#define SSD130X_SET_COM_PINS_CONFIG1_SET(val) FIELD_PREP(SSD130X_SET_COM_PINS_CONFIG1_MASK, !(val))
84+
#define SSD130X_SET_COM_PINS_CONFIG1_SET(val) FIELD_PREP(SSD130X_SET_COM_PINS_CONFIG1_MASK, (val))
8585
#define SSD130X_SET_COM_PINS_CONFIG2_MASK GENMASK(5, 5)
8686
#define SSD130X_SET_COM_PINS_CONFIG2_SET(val) FIELD_PREP(SSD130X_SET_COM_PINS_CONFIG2_MASK, (val))
8787

@@ -298,6 +298,7 @@ static void ssd130x_power_off(struct ssd130x_device *ssd130x)
298298
static int ssd130x_init(struct ssd130x_device *ssd130x)
299299
{
300300
u32 precharge, dclk, com_invdir, compins, chargepump, seg_remap;
301+
bool scan_mode;
301302
int ret;
302303

303304
/* Set initial contrast */
@@ -360,7 +361,13 @@ static int ssd130x_init(struct ssd130x_device *ssd130x)
360361

361362
/* Set COM pins configuration */
362363
compins = BIT(1);
363-
compins |= (SSD130X_SET_COM_PINS_CONFIG1_SET(ssd130x->com_seq) |
364+
/*
365+
* The COM scan mode field values are the inverse of the boolean DT
366+
* property "solomon,com-seq". The value 0b means scan from COM0 to
367+
* COM[N - 1] while 1b means scan from COM[N - 1] to COM0.
368+
*/
369+
scan_mode = !ssd130x->com_seq;
370+
compins |= (SSD130X_SET_COM_PINS_CONFIG1_SET(scan_mode) |
364371
SSD130X_SET_COM_PINS_CONFIG2_SET(ssd130x->com_lrremap));
365372
ret = ssd130x_write_cmd(ssd130x, 2, SSD130X_SET_COM_PINS_CONFIG, compins);
366373
if (ret < 0)

0 commit comments

Comments
 (0)