Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pcmcia Whitespace fix.



details:   https://anonhg.NetBSD.org/src/rev/90c823882a48
branches:  trunk
changeset: 995869:90c823882a48
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Tue Jan 08 08:47:21 2019 +0000

description:
Whitespace fix.

diffstat:

 sys/dev/pcmcia/if_awi_pcmcia.c  |   8 ++++----
 sys/dev/pcmcia/if_malo_pcmcia.c |   8 ++++----
 sys/dev/pcmcia/if_ray.c         |   6 +++---
 sys/dev/pcmcia/if_tr_pcmcia.c   |  12 ++++++------
 sys/dev/pcmcia/if_wi_pcmcia.c   |  16 ++++++++--------
 5 files changed, 25 insertions(+), 25 deletions(-)

diffs (174 lines):

diff -r e05a67e48ee0 -r 90c823882a48 sys/dev/pcmcia/if_awi_pcmcia.c
--- a/sys/dev/pcmcia/if_awi_pcmcia.c    Tue Jan 08 08:22:20 2019 +0000
+++ b/sys/dev/pcmcia/if_awi_pcmcia.c    Tue Jan 08 08:47:21 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_awi_pcmcia.c,v 1.46 2016/07/14 04:19:27 msaitoh Exp $ */
+/* $NetBSD: if_awi_pcmcia.c,v 1.47 2019/01/08 08:47:21 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 1999, 2004 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_awi_pcmcia.c,v 1.46 2016/07/14 04:19:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_awi_pcmcia.c,v 1.47 2019/01/08 08:47:21 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -206,8 +206,8 @@
                am79c930_chip_init(&sc->sc_chip, 0);
 
        error = awi_pcmcia_enable(sc);
-        if (error)
-                goto fail;
+       if (error)
+               goto fail;
        sc->sc_enabled = 1;
 
        awi_read_bytes(sc, AWI_BANNER, sc->sc_banner, AWI_BANNER_LEN);
diff -r e05a67e48ee0 -r 90c823882a48 sys/dev/pcmcia/if_malo_pcmcia.c
--- a/sys/dev/pcmcia/if_malo_pcmcia.c   Tue Jan 08 08:22:20 2019 +0000
+++ b/sys/dev/pcmcia/if_malo_pcmcia.c   Tue Jan 08 08:47:21 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_malo_pcmcia.c,v 1.19 2018/11/15 10:56:29 maxv Exp $ */
+/*     $NetBSD: if_malo_pcmcia.c,v 1.20 2019/01/08 08:47:21 msaitoh Exp $      */
 /*      $OpenBSD: if_malo.c,v 1.65 2009/03/29 21:53:53 sthen Exp $ */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_malo_pcmcia.c,v 1.19 2018/11/15 10:56:29 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_malo_pcmcia.c,v 1.20 2019/01/08 08:47:21 msaitoh Exp $");
 
 #ifdef _MODULE
 #include <sys/module.h>
@@ -173,7 +173,7 @@
        sc->sc_dev = self;
        psc->sc_pf = pa->pf;
 
-        error = pcmcia_function_configure(pa->pf, malo_pcmcia_validate_config);
+       error = pcmcia_function_configure(pa->pf, malo_pcmcia_validate_config);
        if (error) {
                aprint_error_dev(self, "configure failed, error=%d\n", error);
                return;
@@ -916,7 +916,7 @@
                for (i = 0; i < bsize / 2; i++)
                        MALO_WRITE_2(sc, MALO_REG_CMD_WRITE, htole16(uc[i]));
                MALO_WRITE_1(sc, MALO_REG_HOST_STATUS, MALO_VAL_CMD_DL_OVER);
-                MALO_WRITE_2(sc, MALO_REG_CARD_INTR_CAUSE,
+               MALO_WRITE_2(sc, MALO_REG_CARD_INTR_CAUSE,
                    MALO_VAL_CMD_DL_OVER);
 
                /* poll for an acknowledgement */
diff -r e05a67e48ee0 -r 90c823882a48 sys/dev/pcmcia/if_ray.c
--- a/sys/dev/pcmcia/if_ray.c   Tue Jan 08 08:22:20 2019 +0000
+++ b/sys/dev/pcmcia/if_ray.c   Tue Jan 08 08:47:21 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ray.c,v 1.90 2018/06/26 06:48:01 msaitoh Exp $      */
+/*     $NetBSD: if_ray.c,v 1.91 2019/01/08 08:47:21 msaitoh Exp $      */
 
 /*
  * Copyright (c) 2000 Christian E. Hopps
@@ -57,7 +57,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.90 2018/06/26 06:48:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.91 2019/01/08 08:47:21 msaitoh Exp $");
 
 #include "opt_inet.h"
 
@@ -635,7 +635,7 @@
        RAY_DPRINTF(("%s: detach\n", device_xname(sc->sc_dev)));
 
        if (!sc->sc_attached)
-                return (0);
+               return (0);
 
        pmf_device_deregister(self);
 
diff -r e05a67e48ee0 -r 90c823882a48 sys/dev/pcmcia/if_tr_pcmcia.c
--- a/sys/dev/pcmcia/if_tr_pcmcia.c     Tue Jan 08 08:22:20 2019 +0000
+++ b/sys/dev/pcmcia/if_tr_pcmcia.c     Tue Jan 08 08:47:21 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_tr_pcmcia.c,v 1.27 2016/11/27 00:21:43 maya Exp $   */
+/*     $NetBSD: if_tr_pcmcia.c,v 1.28 2019/01/08 08:47:21 msaitoh Exp $        */
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang.  All rights reserved.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tr_pcmcia.c,v 1.27 2016/11/27 00:21:43 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tr_pcmcia.c,v 1.28 2019/01/08 08:47:21 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -149,22 +149,22 @@
                aprint_error_dev(self, "can't allocate sram space\n");
                goto fail3;
        }
-        if (pcmcia_mem_map(psc->sc_pf, PCMCIA_MEM_COMMON, TR_PCMCIA_SRAM_ADDR,
+       if (pcmcia_mem_map(psc->sc_pf, PCMCIA_MEM_COMMON, TR_PCMCIA_SRAM_ADDR,
            TR_SRAM_SIZE, &psc->sc_sramh, &offset, &psc->sc_sram_window) != 0) {
                aprint_error_dev(self, "can't map sram space\n");
                goto fail4;
-        }
+       }
 
        if (pcmcia_mem_alloc(psc->sc_pf, TR_MMIO_SIZE, &psc->sc_mmioh) != 0) {
                aprint_error_dev(self, "can't allocate mmio space\n");
                goto fail5;
                return;
        }
-        if (pcmcia_mem_map(psc->sc_pf, PCMCIA_MEM_COMMON, TR_PCMCIA_MMIO_ADDR,
+       if (pcmcia_mem_map(psc->sc_pf, PCMCIA_MEM_COMMON, TR_PCMCIA_MMIO_ADDR,
            TR_MMIO_SIZE, &psc->sc_mmioh, &offset, &psc->sc_mmio_window) != 0) {
                aprint_error_dev(self, "can't map mmio space\n");
                goto fail6;
-        }
+       }
 
        sc->sc_piot = psc->sc_pioh.iot;
        sc->sc_pioh = psc->sc_pioh.ioh;
diff -r e05a67e48ee0 -r 90c823882a48 sys/dev/pcmcia/if_wi_pcmcia.c
--- a/sys/dev/pcmcia/if_wi_pcmcia.c     Tue Jan 08 08:22:20 2019 +0000
+++ b/sys/dev/pcmcia/if_wi_pcmcia.c     Tue Jan 08 08:47:21 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wi_pcmcia.c,v 1.92 2016/07/07 06:55:42 msaitoh Exp $ */
+/* $NetBSD: if_wi_pcmcia.c,v 1.93 2019/01/08 08:47:21 msaitoh Exp $ */
 
 /*-
  * Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.92 2016/07/07 06:55:42 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wi_pcmcia.c,v 1.93 2019/01/08 08:47:21 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -457,12 +457,12 @@
        CSR_WRITE_2(sc, WI_PARAM1, 0);
        CSR_WRITE_2(sc, WI_PARAM2, 0);
        CSR_WRITE_2(sc, WI_COMMAND, WI_CMD_READEE);
-        for (i = 0; i < WI_TIMEOUT; i++) {
-                if (CSR_READ_2(sc, WI_EVENT_STAT) & WI_EV_CMD)
-                        break;
-                DELAY(1);
-        }
-        CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_CMD);
+       for (i = 0; i < WI_TIMEOUT; i++) {
+               if (CSR_READ_2(sc, WI_EVENT_STAT) & WI_EV_CMD)
+                       break;
+               DELAY(1);
+       }
+       CSR_WRITE_2(sc, WI_EVENT_ACK, WI_EV_CMD);
 
        CSR_WRITE_2(sc, WI_AUX_PAGE, WI_SBCF_PDIADDR / WI_AUX_PGSZ);
        CSR_WRITE_2(sc, WI_AUX_OFFSET, WI_SBCF_PDIADDR % WI_AUX_PGSZ);



Home | Main Index | Thread Index | Old Index