diff mbox series

m68k: mac_via: use explicitly signed char

Message ID 20221026124801.1576326-1-Jason@zx2c4.com
State New
Headers
Series m68k: mac_via: use explicitly signed char |

Commit Message

Jason A. Donenfeld Oct. 26, 2022, 12:48 p.m. UTC 
  The `val` variable is set to -1 and compared against < 0, which means
it's assumed to be signed. However, soon char is to become unsigned
tree-wide. So explicitly mark `val` as signed to that it keeps working
the same way.

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
Geert - Linus asked me to consolidate all of the unsigned-char fixups in
one tree. So, unless you plan on taking this for 6.1, I'll queue it up
in that tree for 6.2, following your ack. -Jason

 arch/m68k/include/asm/mac_via.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Geert Uytterhoeven Oct. 26, 2022, 12:57 p.m. UTC | #1 
Hi Jason,

On Wed, Oct 26, 2022 at 2:48 PM Jason A. Donenfeld <Jason@zx2c4.com> wrote:
> The `val` variable is set to -1 and compared against < 0, which means
> it's assumed to be signed. However, soon char is to become unsigned
> tree-wide. So explicitly mark `val` as signed to that it keeps working
> the same way.
>
> Cc: Geert Uytterhoeven <geert@linux-m68k.org>
> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
> ---
> Geert - Linus asked me to consolidate all of the unsigned-char fixups in
> one tree. So, unless you plan on taking this for 6.1, I'll queue it up
> in that tree for 6.2, following your ack. -Jason

Thanks for your patch!

> --- a/arch/m68k/include/asm/mac_via.h
> +++ b/arch/m68k/include/asm/mac_via.h
> @@ -269,7 +269,7 @@ extern int via2_scsi_drq_pending(void);
>
>  static inline int rbv_set_video_bpp(int bpp)
>  {
> -       char val = (bpp==1)?0:(bpp==2)?1:(bpp==4)?2:(bpp==8)?3:-1;
> +       signed char val = (bpp==1)?0:(bpp==2)?1:(bpp==4)?2:(bpp==8)?3:-1;
>         if (!rbv_present || val<0) return -1;
>         via2[rMonP] = (via2[rMonP] & ~RBV_DEPTH) | val;
>         return 0;

LGTM, although this could just use "int" instead.

Upon closer look, this function is not used, and seems to have never
been used before.  Please just remove it instead.
Thanks!

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
Jason A. Donenfeld Oct. 26, 2022, 12:59 p.m. UTC | #2 
On Wed, Oct 26, 2022 at 2:57 PM Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>
> Hi Jason,
>
> On Wed, Oct 26, 2022 at 2:48 PM Jason A. Donenfeld <Jason@zx2c4.com> wrote:
> > The `val` variable is set to -1 and compared against < 0, which means
> > it's assumed to be signed. However, soon char is to become unsigned
> > tree-wide. So explicitly mark `val` as signed to that it keeps working
> > the same way.
> >
> > Cc: Geert Uytterhoeven <geert@linux-m68k.org>
> > Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
> > ---
> > Geert - Linus asked me to consolidate all of the unsigned-char fixups in
> > one tree. So, unless you plan on taking this for 6.1, I'll queue it up
> > in that tree for 6.2, following your ack. -Jason
>
> Thanks for your patch!
>
> > --- a/arch/m68k/include/asm/mac_via.h
> > +++ b/arch/m68k/include/asm/mac_via.h
> > @@ -269,7 +269,7 @@ extern int via2_scsi_drq_pending(void);
> >
> >  static inline int rbv_set_video_bpp(int bpp)
> >  {
> > -       char val = (bpp==1)?0:(bpp==2)?1:(bpp==4)?2:(bpp==8)?3:-1;
> > +       signed char val = (bpp==1)?0:(bpp==2)?1:(bpp==4)?2:(bpp==8)?3:-1;
> >         if (!rbv_present || val<0) return -1;
> >         via2[rMonP] = (via2[rMonP] & ~RBV_DEPTH) | val;
> >         return 0;
>
> LGTM, although this could just use "int" instead.
>
> Upon closer look, this function is not used, and seems to have never
> been used before.  Please just remove it instead.

Hah! Nice catch. Okay, will send you a removal patch (for you to take).

Jason
diff mbox series

Patch

diff --git a/arch/m68k/include/asm/mac_via.h b/arch/m68k/include/asm/mac_via.h
index 1149251ea58d..e37fcbf47926 100644
--- a/arch/m68k/include/asm/mac_via.h
+++ b/arch/m68k/include/asm/mac_via.h
@@ -269,7 +269,7 @@  extern int via2_scsi_drq_pending(void);
 
 static inline int rbv_set_video_bpp(int bpp)
 {
-	char val = (bpp==1)?0:(bpp==2)?1:(bpp==4)?2:(bpp==8)?3:-1;
+	signed char val = (bpp==1)?0:(bpp==2)?1:(bpp==4)?2:(bpp==8)?3:-1;
 	if (!rbv_present || val<0) return -1;
 	via2[rMonP] = (via2[rMonP] & ~RBV_DEPTH) | val;
 	return 0;