[src/trunk]: src/sys/arch/arm/arm32 Use __func__ in panic calls (and misc sty...

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

details:   https://anonhg.NetBSD.org/src/rev/1e71f93663c8
branches:  trunk
changeset: 946599:1e71f93663c8
user:      skrll <skrll%NetBSD.org@localhost>
date:      Fri Dec 04 07:12:57 2020 +0000

description:
Use __func__ in panic calls (and misc style changes)

diffstat:

 sys/arch/arm/arm32/bus_dma.c |  34 ++++++++++++++++++++--------------
 1 files changed, 20 insertions(+), 14 deletions(-)

diffs (107 lines):

diff -r 2ccb321c7f6e -r 1e71f93663c8 sys/arch/arm/arm32/bus_dma.c
--- a/sys/arch/arm/arm32/bus_dma.c      Fri Dec 04 07:11:35 2020 +0000
+++ b/sys/arch/arm/arm32/bus_dma.c      Fri Dec 04 07:12:57 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_dma.c,v 1.125 2020/12/04 07:11:35 skrll Exp $      */
+/*     $NetBSD: bus_dma.c,v 1.126 2020/12/04 07:12:57 skrll Exp $      */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2020 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
 #include "opt_cputypes.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.125 2020/12/04 07:11:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.126 2020/12/04 07:12:57 skrll Exp $");
 
 #include <sys/param.h>
 
@@ -883,6 +883,7 @@
                cpu_dcache_inv_range(va, len);
                cpu_sdcache_inv_range(va, pa, len);
                break;
+
        case BUS_DMASYNC_POSTREAD:
                STAT_INCR(sync_postread);
                cpu_dcache_inv_range(va, len);
@@ -1049,7 +1050,7 @@
         */
        if ((ops & (BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE)) != 0 &&
            (ops & (BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE)) != 0)
-               panic("_bus_dmamap_sync: mix PRE and POST");
+               panic("%s: mix PRE and POST", __func__);
 
        KASSERTMSG(offset < map->dm_mapsize,
            "offset %lu mapsize %lu",
@@ -1110,24 +1111,28 @@
                case _BUS_DMA_BUFTYPE_LINEAR:
                        memcpy(dataptr, cookie->id_origlinearbuf + offset, len);
                        break;
+
                case _BUS_DMA_BUFTYPE_MBUF:
                        m_copydata(cookie->id_origmbuf, offset, len, dataptr);
                        break;
+
                case _BUS_DMA_BUFTYPE_UIO:
-                       _bus_dma_uiomove(dataptr, cookie->id_origuio, len, UIO_WRITE);
+                       _bus_dma_uiomove(dataptr, cookie->id_origuio, len,
+                           UIO_WRITE);
                        break;
+
 #ifdef DIAGNOSTIC
                case _BUS_DMA_BUFTYPE_RAW:
-                       panic("_bus_dmamap_sync(pre): _BUS_DMA_BUFTYPE_RAW");
+                       panic("%s:(pre): _BUS_DMA_BUFTYPE_RAW", __func__);
                        break;
 
                case _BUS_DMA_BUFTYPE_INVALID:
-                       panic("_bus_dmamap_sync(pre): _BUS_DMA_BUFTYPE_INVALID");
+                       panic("%s(pre): _BUS_DMA_BUFTYPE_INVALID", __func__);
                        break;
 
                default:
-                       panic("_bus_dmamap_sync(pre): map %p: unknown buffer type %d\n",
-                           map, map->_dm_buftype);
+                       panic("%s(pre): map %p: unknown buffer type %d\n",
+                           __func__, map, map->_dm_buftype);
                        break;
 #endif /* DIAGNOSTIC */
                }
@@ -1207,12 +1212,12 @@
                break;
 
        case _BUS_DMA_BUFTYPE_INVALID:
-               panic("_bus_dmamap_sync: _BUS_DMA_BUFTYPE_INVALID");
+               panic("%s: _BUS_DMA_BUFTYPE_INVALID", __func__);
                break;
 
        default:
-               panic("_bus_dmamap_sync: map %p: unknown buffer type %d\n",
-                   map, map->_dm_buftype);
+               panic("%s: map %p: unknown buffer type %d\n", __func__, map,
+                   map->_dm_buftype);
        }
 
        /* Drain the write buffer. */
@@ -1241,17 +1246,18 @@
        case _BUS_DMA_BUFTYPE_UIO:
                _bus_dma_uiomove(dataptr, cookie->id_origuio, len, UIO_READ);
                break;
+
 #ifdef DIAGNOSTIC
        case _BUS_DMA_BUFTYPE_RAW:
-               panic("_bus_dmamap_sync(post): _BUS_DMA_BUFTYPE_RAW");
+               panic("%s(post): _BUS_DMA_BUFTYPE_RAW", __func__);
                break;
 
        case _BUS_DMA_BUFTYPE_INVALID:
-               panic("_bus_dmamap_sync(post): _BUS_DMA_BUFTYPE_INVALID");
+               panic("%s(post): _BUS_DMA_BUFTYPE_INVALID", __func__);
                break;
 
        default:
-               panic("_bus_dmamap_sync(post): map %p: unknown buffer type %d\n",
+               panic("%s(post): map %p: unknown buffer type %d\n", __func__,
                    map, map->_dm_buftype);
                break;
 #endif