arch/powerpc: Simplify some calculations using ARRAY_SIZE() macro.

[oweals/u-boot.git] / arch / powerpc / cpu / mpc8260 / serial_smc.c

diff --git a/arch/powerpc/cpu/mpc8260/serial_smc.c b/arch/powerpc/cpu/mpc8260/serial_smc.c
index 0f3b834d9e64729e8b35f02a173c3d8c2275cc84..594c5ebf1a843e8dac7292c3f2b04ab979b329df 100644 (file)
--- a/arch/powerpc/cpu/mpc8260/serial_smc.c
+++ b/arch/powerpc/cpu/mpc8260/serial_smc.c
@@ -2,23 +2,7 @@
  * (C) Copyright 2000, 2001, 2002
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  *
  * Hacked for MPC8260 by Murray.Jensen@cmst.csiro.au, 19-Oct-00, with
  * changes based on the file arch/powerpc/mbxboot/m8260_tty.c from the
@@ -105,7 +89,7 @@ static int mpc8260_smc_serial_init(void)
        /* initialize pointers to SMC */
 
        sp = (smc_t *) &(im->im_smc[SMC_INDEX]);
-       *(ushort *)(&im->im_dprambase[PROFF_SMC_BASE]) = PROFF_SMC;
+       im->im_dprambase16[PROFF_SMC_BASE / sizeof(u16)] = PROFF_SMC;
        up = (smc_uart_t *)&im->im_dprambase[PROFF_SMC];
 
        /* Disable transmitter/receiver. */
@@ -216,13 +200,6 @@ static void mpc8260_smc_serial_putc(const char c)
        rtx->txbd.cbd_sc |= BD_SC_READY;
 }
 
-static void mpc8260_smc_serial_puts(const char *s)
-{
-       while (*s) {
-               serial_putc (*s++);
-       }
-}
-
 static int mpc8260_smc_serial_getc(void)
 {
        volatile smc_uart_t     *up;
@@ -264,14 +241,13 @@ static int mpc8260_smc_serial_tstc(void)
        return !(rtx->rxbd.cbd_sc & BD_SC_EMPTY);
 }
 
-#ifdef CONFIG_SERIAL_MULTI
 static struct serial_device mpc8260_smc_serial_drv = {
        .name   = "mpc8260_smc_uart",
        .start  = mpc8260_smc_serial_init,
        .stop   = NULL,
        .setbrg = mpc8260_smc_serial_setbrg,
        .putc   = mpc8260_smc_serial_putc,
-       .puts   = mpc8260_smc_serial_puts,
+       .puts   = default_serial_puts,
        .getc   = mpc8260_smc_serial_getc,
        .tstc   = mpc8260_smc_serial_tstc,
 };
@@ -285,37 +261,6 @@ __weak struct serial_device *default_serial_console(void)
 {
        return &mpc8260_smc_serial_drv;
 }
-#else
-int serial_init(void)
-{
-       return mpc8260_smc_serial_init();
-}
-
-void serial_setbrg(void)
-{
-       mpc8260_smc_serial_setbrg();
-}
-
-void serial_putc(const char c)
-{
-       mpc8260_smc_serial_putc(c);
-}
-
-void serial_puts(const char *s)
-{
-       mpc8260_smc_serial_puts(s);
-}
-
-int serial_getc(void)
-{
-       return mpc8260_smc_serial_getc();
-}
-
-int serial_tstc(void)
-{
-       return mpc8260_smc_serial_tstc();
-}
-#endif
 #endif /* CONFIG_CONS_ON_SMC */
 
 #if defined(CONFIG_KGDB_ON_SMC)
@@ -370,7 +315,7 @@ kgdb_serial_init (void)
        /* initialize pointers to SMC */
 
        sp = (smc_t *) &(im->im_smc[KGDB_SMC_INDEX]);
-       *(ushort *)(&im->im_dprambase[KGDB_PROFF_SMC_BASE]) = KGDB_PROFF_SMC;
+       im->im_dprambase16[KGDB_PROFF_SMC_BASE / sizeof(u16)] = KGDB_PROFF_SMC;
        up = (smc_uart_t *)&im->im_dprambase[KGDB_PROFF_SMC];
 
        /* Disable transmitter/receiver. */