media: i2c: adv748x: Fix unsafe macros
Subsystems (2)
PATCH 1/1 media: i2c: adv748x: Fix unsafe macros
Enclose multiple macro parameters in parentheses in order to make such macros safer and fix the Clang warning below:
drivers/media/i2c/adv748x/adv748x-afe.c:452:12: warning: operator '?:' has lower precedence than '|'; '|' will be evaluated first [-Wbitwise-conditional-parentheses]
ret = sdp_clrset(state, ADV748X_SDP_FRP, ADV748X_SDP_FRP_MASK, enable ? ctrl->val - 1 : 0);
--- drivers/media/i2c/adv748x/adv748x.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/media/i2c/adv748x/adv748x.h +4 -4
@@ -394,10 +394,10 @@ int adv748x_write_block(struct adv748x_state *state, int client_page,#define io_read (s, r) adv748x_read(s, ADV748X_PAGE_IO, r)#define io_write (s, r, v) adv748x_write(s, ADV748X_PAGE_IO, r, v) -#define io_clrset (s, r, m, v) io_write(s, r, (io_read(s, r) & ~m) | v) +#define io_clrset (s, r, m, v) io_write(s, r, (io_read(s, r) & ~(m)) | (v))#define hdmi_read (s, r) adv748x_read(s, ADV748X_PAGE_HDMI, r) -#define hdmi_read16 (s, r, m) (((hdmi_read(s, r) << 8) | hdmi_read(s, r+1)) & m) +#define hdmi_read16 (s, r, m) (((hdmi_read(s, r) << 8) | hdmi_read(s, (r)+1)) & (m))#define hdmi_write (s, r, v) adv748x_write(s, ADV748X_PAGE_HDMI, r, v)#define repeater_read (s, r) adv748x_read(s, ADV748X_PAGE_REPEATER, r)
@@ -405,11 +405,11 @@ int adv748x_write_block(struct adv748x_state *state, int client_page,#define sdp_read (s, r) adv748x_read(s, ADV748X_PAGE_SDP, r)#define sdp_write (s, r, v) adv748x_write(s, ADV748X_PAGE_SDP, r, v) -#define sdp_clrset (s, r, m, v) sdp_write(s, r, (sdp_read(s, r) & ~m) | v) +#define sdp_clrset (s, r, m, v) sdp_write(s, r, (sdp_read(s, r) & ~(m)) | (v))#define cp_read (s, r) adv748x_read(s, ADV748X_PAGE_CP, r)#define cp_write (s, r, v) adv748x_write(s, ADV748X_PAGE_CP, r, v) -#define cp_clrset (s, r, m, v) cp_write(s, r, (cp_read(s, r) & ~m) | v) +#define cp_clrset (s, r, m, v) cp_write(s, r, (cp_read(s, r) & ~(m)) | (v))#define tx_read (t, r) adv748x_read(t->state, t->page, r)#define tx_write (t, r, v) adv748x_write(t->state, t->page, r, v)
Signature · 1 line
2.23.0
Hi Gustavo,
Quoted 7 lines · Gustavo A. R. Silva
Enclose multiple macro parameters in parentheses in order to make such macros safer and fix the Clang warning below:
drivers/media/i2c/adv748x/adv748x-afe.c:452:12: warning: operator '?:' has lower precedence than '|'; '|' will be evaluated first [-Wbitwise-conditional-parentheses]
Quoted 6 lines
ret =
sdp_clrset(state, ADV748X_SDP_FRP, ADV748X_SDP_FRP_MASK, enable ? ctrl->val - 1 : 0);Fixes 3e89586a64df ("media: i2c: adv748x: add adv748x driver")Reported-by Dmitry Vyukov <[email protected]>Signed-off-by Gustavo A. R. Silva <[email protected]>
Thanks,
You beat me to posting - but that looks incredibly close (identical I think) to the one I had prepared.
Quoted 36 lines
--- drivers/media/i2c/adv748x/adv748x.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/media/i2c/adv748x/adv748x.h +4
-4@@ -394,10 +394,10 @@ int adv748x_write_block(struct adv748x_state *state, int client_page,#define io_read (s, r) adv748x_read(s, ADV748X_PAGE_IO, r)#define io_write (s, r, v) adv748x_write(s, ADV748X_PAGE_IO, r, v) -#define io_clrset (s, r, m, v) io_write(s, r, (io_read(s, r) & ~m) | v) +#define io_clrset (s, r, m, v) io_write(s, r, (io_read(s, r) & ~(m)) | (v))#define hdmi_read (s, r) adv748x_read(s, ADV748X_PAGE_HDMI, r) -#define hdmi_read16 (s, r, m) (((hdmi_read(s, r) << 8) | hdmi_read(s, r+1)) & m) +#define hdmi_read16 (s, r, m) (((hdmi_read(s, r) << 8) | hdmi_read(s, (r)+1)) & (m))#define hdmi_write (s, r, v) adv748x_write(s, ADV748X_PAGE_HDMI, r, v)#define repeater_read (s, r) adv748x_read(s, ADV748X_PAGE_REPEATER, r)@@ -405,11 +405,11 @@ int adv748x_write_block(struct adv748x_state *state, int client_page,#define sdp_read (s, r) adv748x_read(s, ADV748X_PAGE_SDP, r)#define sdp_write (s, r, v) adv748x_write(s, ADV748X_PAGE_SDP, r, v) -#define sdp_clrset (s, r, m, v) sdp_write(s, r, (sdp_read(s, r) & ~m) | v) +#define sdp_clrset (s, r, m, v) sdp_write(s, r, (sdp_read(s, r) & ~(m)) | (v))#define cp_read (s, r) adv748x_read(s, ADV748X_PAGE_CP, r)#define cp_write (s, r, v) adv748x_write(s, ADV748X_PAGE_CP, r, v) -#define cp_clrset (s, r, m, v) cp_write(s, r, (cp_read(s, r) & ~m) | v) +#define cp_clrset (s, r, m, v) cp_write(s, r, (cp_read(s, r) & ~(m)) | (v))#define tx_read (t, r) adv748x_read(t->state, t->page, r)#define tx_write (t, r, v) adv748x_write(t->state, t->page, r, v)
Quoted 7 lines · Gustavo A. R. Silva
Enclose multiple macro parameters in parentheses in order to make such macros safer and fix the Clang warning below:
drivers/media/i2c/adv748x/adv748x-afe.c:452:12: warning: operator '?:' has lower precedence than '|'; '|' will be evaluated first [-Wbitwise-conditional-parentheses]
Quoted 6 lines
ret =
sdp_clrset(state, ADV748X_SDP_FRP, ADV748X_SDP_FRP_MASK, enable ? ctrl->val - 1 : 0);Fixes 3e89586a64df ("media: i2c: adv748x: add adv748x driver")Reported-by Dmitry Vyukov <[email protected]>Signed-off-by Gustavo A. R. Silva <[email protected]
It doesn't look like this was picked up? I still see this warning on 5.5-rc6 and next-20200113.
If it helps:
Quoted 38 lines
--- drivers/media/i2c/adv748x/adv748x.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/media/i2c/adv748x/adv748x.h +4
-4@@ -394,10 +394,10 @@ int adv748x_write_block(struct adv748x_state *state, int client_page,#define io_read (s, r) adv748x_read(s, ADV748X_PAGE_IO, r)#define io_write (s, r, v) adv748x_write(s, ADV748X_PAGE_IO, r, v) -#define io_clrset (s, r, m, v) io_write(s, r, (io_read(s, r) & ~m) | v) +#define io_clrset (s, r, m, v) io_write(s, r, (io_read(s, r) & ~(m)) | (v))#define hdmi_read (s, r) adv748x_read(s, ADV748X_PAGE_HDMI, r) -#define hdmi_read16 (s, r, m) (((hdmi_read(s, r) << 8) | hdmi_read(s, r+1)) & m) +#define hdmi_read16 (s, r, m) (((hdmi_read(s, r) << 8) | hdmi_read(s, (r)+1)) & (m))#define hdmi_write (s, r, v) adv748x_write(s, ADV748X_PAGE_HDMI, r, v)#define repeater_read (s, r) adv748x_read(s, ADV748X_PAGE_REPEATER, r)@@ -405,11 +405,11 @@ int adv748x_write_block(struct adv748x_state *state, int client_page,#define sdp_read (s, r) adv748x_read(s, ADV748X_PAGE_SDP, r)#define sdp_write (s, r, v) adv748x_write(s, ADV748X_PAGE_SDP, r, v) -#define sdp_clrset (s, r, m, v) sdp_write(s, r, (sdp_read(s, r) & ~m) | v) +#define sdp_clrset (s, r, m, v) sdp_write(s, r, (sdp_read(s, r) & ~(m)) | (v))#define cp_read (s, r) adv748x_read(s, ADV748X_PAGE_CP, r)#define cp_write (s, r, v) adv748x_write(s, ADV748X_PAGE_CP, r, v) -#define cp_clrset (s, r, m, v) cp_write(s, r, (cp_read(s, r) & ~m) | v) +#define cp_clrset (s, r, m, v) cp_write(s, r, (cp_read(s, r) & ~(m)) | (v))#define tx_read (t, r) adv748x_read(t->state, t->page, r)#define tx_write (t, r, v) adv748x_write(t->state, t->page, r, v)Signature · 1 line
2.23.0
Quoted 7 lines · Gustavo A. R. Silva
Hi!
Friendly ping:Who can take this?
It's been almost three months now since I first sent this patch out.
Kieran is listed as maintainer of:
998 F: drivers/media/i2c/adv748x/*
but I'm guessing the tree would be Mauro's. It would be good if Kieran can review, then Mauro can pick up?
Signature · 2 lines
Thanks, ~Nick Desaulniers
Hi!
Quoting Nathan Chancellor <[email protected]>:
Quoted 15 lines · Gustavo A. R. Silva
Quoted 7 lines
Enclose multiple macro parameters in parentheses in order to make such macros safer and fix the Clang warning below:
drivers/media/i2c/adv748x/adv748x-afe.c:452:12: warning: operator '?:' has lower precedence than '|'; '|' will be evaluated first [-Wbitwise-conditional-parentheses]Quoted 6 lines
ret =
sdp_clrset(state, ADV748X_SDP_FRP, ADV748X_SDP_FRP_MASK, enable ? ctrl->val - 1 : 0);Fixes 3e89586a64df ("media: i2c: adv748x: add adv748x driver")Reported-by Dmitry Vyukov <[email protected]>Signed-off-by Gustavo A. R. Silva <[email protected]
Quoted 7 lines
It doesn't look like this was picked up? I still see this warning on 5.5-rc6 and next-20200113.
If it helps:
Reviewed-by Nathan Chancellor <[email protected]>
Thank you, Nathan! :)
Friendly ping:
Who can take this?
It's been almost three months now since I first sent this patch out.
Thanks!
--
Gustavo
Quoted 43 lines
Quoted 43 lines
--- drivers/media/i2c/adv748x/adv748x.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/media/i2c/adv748x/adv748x.h +2
-2@@ -394,10 +394,10 @@ int adv748x_write_block(struct adv748x_state *state, int client_page,#define io_read (s, r) adv748x_read(s, ADV748X_PAGE_IO, r)#define io_write (s, r, v) adv748x_write(s, ADV748X_PAGE_IO, r, v) -#define io_clrset (s, r, m, v) io_write(s, r, (io_read(s, r) & ~m) | v) +#define io_clrset (s, r, m, v) io_write(s, r, (io_read(s, r) & ~(m)) | (v))#define hdmi_read (s, r) adv748x_read(s, ADV748X_PAGE_HDMI, r) -#define hdmi_read16 (s, r, m) (((hdmi_read(s, r) << 8) | hdmi_read(s, r+1)) & m) +#define hdmi_read16 (s, r, m) (((hdmi_read(s, r) << 8) | hdmi_read(s, (r)+1)) & (m))#define
hdmi_write(s, r, v)adv748x_write(s, ADV748X_PAGE_HDMI, r, v)#define
repeater_read(s, r)adv748x_read(s, ADV748X_PAGE_REPEATER, r)drivers/media/i2c/adv748x/adv748x.h +2
-2@@ -405,11 +405,11 @@ int adv748x_write_block(struct adv748x_state *state, int client_page,#define sdp_read (s, r) adv748x_read(s, ADV748X_PAGE_SDP, r)#define sdp_write (s, r, v) adv748x_write(s, ADV748X_PAGE_SDP, r, v) -#define sdp_clrset (s, r, m, v) sdp_write(s, r, (sdp_read(s, r) & ~m) | v) +#define sdp_clrset (s, r, m, v) sdp_write(s, r, (sdp_read(s, r) & ~(m)) | (v))#define cp_read (s, r) adv748x_read(s, ADV748X_PAGE_CP, r)#define cp_write (s, r, v) adv748x_write(s, ADV748X_PAGE_CP, r, v) -#define cp_clrset (s, r, m, v) cp_write(s, r, (cp_read(s, r) & ~m) | v) +#define cp_clrset (s, r, m, v) cp_write(s, r, (cp_read(s, r) & ~(m)) | (v))#define
tx_read(t, r)adv748x_read(t->state, t->page, r)#definetx_write(t, r, v)adv748x_write(t->state, t->page, r, v)
--
2.23.0
Kieran Bingham
maintainerHi Nick
Quoted 8 lines · Nick Desaulniers
Quoted 6 lines · Gustavo A. R. Silva
Hi!
Friendly ping:Who can take this?
Quoted 7 lines
Quoted 1 line
It's been almost three months now since I first sent this patch out.
Kieran is listed as maintainer of:
998 F:drivers/media/i2c/adv748x/*but I'm guessing the tree would be Mauro's. It would be good if Kieran can review, then Mauro can pick up?
Already done on the 22nd October 2019:
https://lore.kernel.org/linux-media/[email protected]/
Hans, Should this go through you?
Or are we just waiting for Mauro to pick it up?
Signature · 3 lines
Regards -- Kieran
Quoted 11 lines · Nathan Chancellor
Quoted 10 lines · Gustavo A. R. Silva
Enclose multiple macro parameters in parentheses in order to make such macros safer and fix the Clang warning below:
drivers/media/i2c/adv748x/adv748x-afe.c:452:12: warning: operator '?:' has lower precedence than '|'; '|' will be evaluated first [-Wbitwise-conditional-parentheses]ret =
sdp_clrset(state, ADV748X_SDP_FRP, ADV748X_SDP_FRP_MASK, enable ? ctrl->val - 1 : 0);
Quoted 6 lines
Quoted 3 lines
Fixes 3e89586a64df ("media: i2c: adv748x: add adv748x driver")Reported-by Dmitry Vyukov <[email protected]>Signed-off-by Gustavo A. R. Silva <[email protected]It doesn't look like this was picked up? I still see this warning on 5.5-rc6 and next-20200113.
It's been picked up some time ago and will appear in 5.6.
Regards,
Hans
Quoted 43 lines
If it helps:
Reviewed-by Nathan Chancellor <[email protected]>Quoted 38 lines
--- drivers/media/i2c/adv748x/adv748x.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/media/i2c/adv748x/adv748x.h +4
-4@@ -394,10 +394,10 @@ int adv748x_write_block(struct adv748x_state *state, int client_page,#define io_read (s, r) adv748x_read(s, ADV748X_PAGE_IO, r)#define io_write (s, r, v) adv748x_write(s, ADV748X_PAGE_IO, r, v) -#define io_clrset (s, r, m, v) io_write(s, r, (io_read(s, r) & ~m) | v) +#define io_clrset (s, r, m, v) io_write(s, r, (io_read(s, r) & ~(m)) | (v))#define hdmi_read (s, r) adv748x_read(s, ADV748X_PAGE_HDMI, r) -#define hdmi_read16 (s, r, m) (((hdmi_read(s, r) << 8) | hdmi_read(s, r+1)) & m) +#define hdmi_read16 (s, r, m) (((hdmi_read(s, r) << 8) | hdmi_read(s, (r)+1)) & (m))#define hdmi_write (s, r, v) adv748x_write(s, ADV748X_PAGE_HDMI, r, v)#define repeater_read (s, r) adv748x_read(s, ADV748X_PAGE_REPEATER, r)@@ -405,11 +405,11 @@ int adv748x_write_block(struct adv748x_state *state, int client_page,#define sdp_read (s, r) adv748x_read(s, ADV748X_PAGE_SDP, r)#define sdp_write (s, r, v) adv748x_write(s, ADV748X_PAGE_SDP, r, v) -#define sdp_clrset (s, r, m, v) sdp_write(s, r, (sdp_read(s, r) & ~m) | v) +#define sdp_clrset (s, r, m, v) sdp_write(s, r, (sdp_read(s, r) & ~(m)) | (v))#define cp_read (s, r) adv748x_read(s, ADV748X_PAGE_CP, r)#define cp_write (s, r, v) adv748x_write(s, ADV748X_PAGE_CP, r, v) -#define cp_clrset (s, r, m, v) cp_write(s, r, (cp_read(s, r) & ~m) | v) +#define cp_clrset (s, r, m, v) cp_write(s, r, (cp_read(s, r) & ~(m)) | (v))#define tx_read (t, r) adv748x_read(t->state, t->page, r)#define tx_write (t, r, v) adv748x_write(t->state, t->page, r, v)Signature · 1 line
2.23.0
Quoted 13 lines · Hans Verkuil
Quoted 11 lines · Nathan Chancellor
Quoted 10 lines · Gustavo A. R. Silva
Enclose multiple macro parameters in parentheses in order to make such macros safer and fix the Clang warning below:
drivers/media/i2c/adv748x/adv748x-afe.c:452:12: warning: operator '?:' has lower precedence than '|'; '|' will be evaluated first [-Wbitwise-conditional-parentheses]ret =
sdp_clrset(state, ADV748X_SDP_FRP, ADV748X_SDP_FRP_MASK, enable ? ctrl->val - 1 : 0);
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Fixes 3e89586a64df ("media: i2c: adv748x: add adv748x driver")Reported-by Dmitry Vyukov <[email protected]>Signed-off-by Gustavo A. R. Silva <[email protected]It doesn't look like this was picked up? I still see this warning on 5.5-rc6 and next-20200113.
It's been picked up some time ago and will appear in 5.6.
https://git.linuxtv.org/media_tree.git/commit/?id=0d962e061abcf1b9105f88fb850158b5887fbca3
Signature · 2 lines
Thanks, ~Nick Desaulniers