[src/trunk]: src/sys/dev/spi On second thought revert that. Let's open this c...

[tnn <tnn%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4c7610640085
branches:  trunk
changeset: 463888:4c7610640085
user:      tnn <tnn%NetBSD.org@localhost>
date:      Sat Sep 14 15:12:12 2019 +0000

description:
On second thought revert that. Let's open this can of worms some other day.

diffstat:

 sys/dev/spi/m25p.c     |  8 ++++----
 sys/dev/spi/spiflash.c |  6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (56 lines):

diff -r 80122db18e47 -r 4c7610640085 sys/dev/spi/m25p.c
--- a/sys/dev/spi/m25p.c        Sat Sep 14 15:06:33 2019 +0000
+++ b/sys/dev/spi/m25p.c        Sat Sep 14 15:12:12 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: m25p.c,v 1.13 2019/09/14 14:41:23 tnn Exp $ */
+/* $NetBSD: m25p.c,v 1.14 2019/09/14 15:12:12 tnn Exp $ */
 
 /*-
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: m25p.c,v 1.13 2019/09/14 14:41:23 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: m25p.c,v 1.14 2019/09/14 15:12:12 tnn Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -88,8 +88,8 @@
        uint8_t         mfgid;
        uint16_t        devid;
        const char      *name;
-       uint16_t        size;   /* in kB */
-       uint16_t        sector; /* in kB */
+       uint16_t        size;   /* in KB */
+       uint16_t        sector; /* in KB */
        uint16_t        mhz;
 } m25p_infos[] = {
        { 0x16, 0x20, 0x2017, "STMicro M25P64", 8192, 64 },     /* 64Mbit */
diff -r 80122db18e47 -r 4c7610640085 sys/dev/spi/spiflash.c
--- a/sys/dev/spi/spiflash.c    Sat Sep 14 15:06:33 2019 +0000
+++ b/sys/dev/spi/spiflash.c    Sat Sep 14 15:12:12 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: spiflash.c,v 1.22 2019/09/14 14:41:23 tnn Exp $ */
+/* $NetBSD: spiflash.c,v 1.23 2019/09/14 15:12:12 tnn Exp $ */
 
 /*-
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spiflash.c,v 1.22 2019/09/14 14:41:23 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spiflash.c,v 1.23 2019/09/14 15:12:12 tnn Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -224,7 +224,7 @@
        aprint_naive(": SPI flash\n");
        aprint_normal(": %s SPI flash\n", sc->sc_name);
        /* XXX: note that this has to change for boot-sectored flash */
-       aprint_normal_dev(self, "%d kB, %d sectors of %d kB each\n",
+       aprint_normal_dev(self, "%d KB, %d sectors of %d KB each\n",
            sc->sc_device_size / 1024,
            sc->sc_device_size / sc->sc_erase_size,
            sc->sc_erase_size / 1024);