2 files changed, 11 insertions, 37 deletions

diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 386fb878680c..403b01b382e2 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -376,9 +376,9 @@ static void sci_transmit_chars(struct uart_port *port)
         if (!(status & SCxSR_TDxE(port))) {
                 ctrl = sci_in(port, SCSCR);
                 if (uart_circ_empty(xmit))
-                        ctrl &= ~SCI_CTRL_FLAGS_TIE;
+                        ctrl &= ~SCSCR_TIE;
                 else
-                        ctrl |= SCI_CTRL_FLAGS_TIE;
+                        ctrl |= SCSCR_TIE;
                 sci_out(port, SCSCR, ctrl);
                 return;
         }
@@ -420,7 +420,7 @@ static void sci_transmit_chars(struct uart_port *port)
                         sci_out(port, SCxSR, SCxSR_TDxE_CLEAR(port));
                 }
 
-                ctrl |= SCI_CTRL_FLAGS_TIE;
+                ctrl |= SCSCR_TIE;
                 sci_out(port, SCSCR, ctrl);
         }
 }
@@ -721,16 +721,16 @@ static irqreturn_t sci_mpxed_interrupt(int irq, void *ptr)
         scr_status = sci_in(port, SCSCR);
 
         /* Tx Interrupt */
-        if ((ssr_status & 0x0020) && (scr_status & SCI_CTRL_FLAGS_TIE))
+        if ((ssr_status & 0x0020) && (scr_status & SCSCR_TIE))
                 ret = sci_tx_interrupt(irq, ptr);
         /* Rx Interrupt */
-        if ((ssr_status & 0x0002) && (scr_status & SCI_CTRL_FLAGS_RIE))
+        if ((ssr_status & 0x0002) && (scr_status & SCSCR_RIE))
                 ret = sci_rx_interrupt(irq, ptr);
         /* Error Interrupt */
-        if ((ssr_status & 0x0080) && (scr_status & SCI_CTRL_FLAGS_REIE))
+        if ((ssr_status & 0x0080) && (scr_status & SCSCR_REIE))
                 ret = sci_er_interrupt(irq, ptr);
         /* Break Interrupt */
-        if ((ssr_status & 0x0010) && (scr_status & SCI_CTRL_FLAGS_REIE))
+        if ((ssr_status & 0x0010) && (scr_status & SCSCR_REIE))
                 ret = sci_br_interrupt(irq, ptr);
 
         return ret;
@@ -861,7 +861,7 @@ static void sci_start_tx(struct uart_port *port)
 
         /* Set TIE (Transmit Interrupt Enable) bit in SCSCR */
         ctrl = sci_in(port, SCSCR);
-        ctrl |= SCI_CTRL_FLAGS_TIE;
+        ctrl |= SCSCR_TIE;
         sci_out(port, SCSCR, ctrl);
 }
 
@@ -871,7 +871,7 @@ static void sci_stop_tx(struct uart_port *port)
 
         /* Clear TIE (Transmit Interrupt Enable) bit in SCSCR */
         ctrl = sci_in(port, SCSCR);
-        ctrl &= ~SCI_CTRL_FLAGS_TIE;
+        ctrl &= ~SCSCR_TIE;
         sci_out(port, SCSCR, ctrl);
 }
 
@@ -881,7 +881,7 @@ static void sci_start_rx(struct uart_port *port, unsigned int tty_start)
 
         /* Set RIE (Receive Interrupt Enable) bit in SCSCR */
         ctrl = sci_in(port, SCSCR);
-        ctrl |= SCI_CTRL_FLAGS_RIE | SCI_CTRL_FLAGS_REIE;
+        ctrl |= SCSCR_RIE | SCSCR_REIE;
         sci_out(port, SCSCR, ctrl);
 }
 
@@ -891,7 +891,7 @@ static void sci_stop_rx(struct uart_port *port)
 
         /* Clear RIE (Receive Interrupt Enable) bit in SCSCR */
         ctrl = sci_in(port, SCSCR);
-        ctrl &= ~(SCI_CTRL_FLAGS_RIE | SCI_CTRL_FLAGS_REIE);
+        ctrl &= ~(SCSCR_RIE | SCSCR_REIE);
         sci_out(port, SCSCR, ctrl);
 }
 
diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h
index 5366e780aaeb..def626307c33 100644
--- a/drivers/serial/sh-sci.h
+++ b/drivers/serial/sh-sci.h
@@ -138,32 +138,6 @@
 # error CPU subtype not defined
 #endif
 
-/* SCSCR */
-#define SCI_CTRL_FLAGS_TIE  0x80 /* all */
-#define SCI_CTRL_FLAGS_RIE  0x40 /* all */
-#define SCI_CTRL_FLAGS_TE   0x20 /* all */
-#define SCI_CTRL_FLAGS_RE   0x10 /* all */
-#if defined(CONFIG_CPU_SUBTYPE_SH7750)  || \
-    defined(CONFIG_CPU_SUBTYPE_SH7091)  || \
-    defined(CONFIG_CPU_SUBTYPE_SH7750R) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7722)  || \
-    defined(CONFIG_CPU_SUBTYPE_SH7750S) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7751)  || \
-    defined(CONFIG_CPU_SUBTYPE_SH7751R) || \
-    defined(CONFIG_CPU_SUBTYPE_SH7763)  || \
-    defined(CONFIG_CPU_SUBTYPE_SH7780)  || \
-    defined(CONFIG_CPU_SUBTYPE_SH7785)  || \
-    defined(CONFIG_CPU_SUBTYPE_SH7786)  || \
-    defined(CONFIG_CPU_SUBTYPE_SHX3)
-#define SCI_CTRL_FLAGS_REIE 0x08 /* 7750 SCIF */
-#else
-#define SCI_CTRL_FLAGS_REIE 0
-#endif
-/*      SCI_CTRL_FLAGS_MPIE 0x08  * 7707 SCI, 7708 SCI, 7709 SCI, 7750 SCI */
-/*      SCI_CTRL_FLAGS_TEIE 0x04  * 7707 SCI, 7708 SCI, 7709 SCI, 7750 SCI */
-/*      SCI_CTRL_FLAGS_CKE1 0x02  * all */
-/*      SCI_CTRL_FLAGS_CKE0 0x01  * 7707 SCI/SCIF, 7708 SCI, 7709 SCI/SCIF, 7750 SCI */
-
 /* SCxSR SCI */
 #define SCI_TDRE  0x80 /* 7707 SCI, 7708 SCI, 7709 SCI, 7750 SCI */
 #define SCI_RDRF  0x40 /* 7707 SCI, 7708 SCI, 7709 SCI, 7750 SCI */