Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9efeca6 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Greg Kroah-Hartman
Browse files

serial: sh-sci: Prevent compiler warnings on 64-bit 



Expressions involving "BIT(...)" create values of type "long", which is
64-bit on 64-bit.  Hence "~BIT(...)" no longer fits in 32-bit, which
will cause future compiler warnings when assigning to 32-bit variables:

    drivers/tty/serial/sh-sci.c: In function 'sci_init_single':
    drivers/tty/serial/sh-sci.h:58:25: warning: large integer implicitly truncated to unsigned type [-Woverflow]
     #define SCI_ERROR_CLEAR ~(SCI_RESERVED | SCI_PER | SCI_FER | SCI_ORER)
			     ^
    drivers/tty/serial/sh-sci.c:2325:27: note: in expansion of macro 'SCI_ERROR_CLEAR'
       sci_port->error_clear = SCI_ERROR_CLEAR;

As these values are (at most) 32-bit register values anyway, cast them
to "u32" at the definition level to prevent such compiler warnings.

Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a1b5b43f

drivers/tty/serial/sh-sci.h

+8 −8
Original line number Diff line number Diff line
@@ -54,10 +54,10 @@ enum { 


#define SCI_DEFAULT_ERROR_MASK (SCI_PER | SCI_FER)



#define SCI_RDxF_CLEAR	~(SCI_RESERVED | SCI_RDRF)

#define SCI_ERROR_CLEAR	~(SCI_RESERVED | SCI_PER | SCI_FER | SCI_ORER)

#define SCI_TDxE_CLEAR	~(SCI_RESERVED | SCI_TEND | SCI_TDRE)

#define SCI_BREAK_CLEAR	~(SCI_RESERVED | SCI_PER | SCI_FER | SCI_ORER)

#define SCI_RDxF_CLEAR	(u32)(~(SCI_RESERVED | SCI_RDRF))

#define SCI_ERROR_CLEAR	(u32)(~(SCI_RESERVED | SCI_PER | SCI_FER | SCI_ORER))

#define SCI_TDxE_CLEAR	(u32)(~(SCI_RESERVED | SCI_TEND | SCI_TDRE))

#define SCI_BREAK_CLEAR	(u32)(~(SCI_RESERVED | SCI_PER | SCI_FER | SCI_ORER))



/* SCxSR (Serial Status Register) on SCIF, SCIFA, SCIFB, HSCIF */

#define SCIF_ER		BIT(7)	/* Receive Error */
@@ -76,10 +76,10 @@ enum { 


#define SCIF_DEFAULT_ERROR_MASK (SCIF_PER | SCIF_FER | SCIF_BRK | SCIF_ER)



#define SCIF_RDxF_CLEAR		~(SCIF_DR | SCIF_RDF)

#define SCIF_ERROR_CLEAR	~(SCIFA_ORER | SCIF_PER | SCIF_FER | SCIF_ER)

#define SCIF_TDxE_CLEAR		~(SCIF_TDFE)

#define SCIF_BREAK_CLEAR	~(SCIF_PER | SCIF_FER | SCIF_BRK)

#define SCIF_RDxF_CLEAR		(u32)(~(SCIF_DR | SCIF_RDF))

#define SCIF_ERROR_CLEAR	(u32)(~(SCIFA_ORER | SCIF_PER | SCIF_FER | SCIF_ER))

#define SCIF_TDxE_CLEAR		(u32)(~(SCIF_TDFE))

#define SCIF_BREAK_CLEAR	(u32)(~(SCIF_PER | SCIF_FER | SCIF_BRK))



/* SCFCR (FIFO Control Register) */

#define SCFCR_MCE	BIT(3)	/* Modem Control Enable */