[src/trunk]: src/sys/arch/arm arm: Use device_set_private for various drivers.

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

details:   https://anonhg.NetBSD.org/src/rev/f05ac1337896
branches:  trunk
changeset: 362583:f05ac1337896
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu Mar 03 06:26:28 2022 +0000

description:
arm: Use device_set_private for various drivers.

diffstat:

 sys/arch/arm/broadcom/bcm53xx_cca.c |  4 ++--
 sys/arch/arm/broadcom/bcm53xx_ccb.c |  4 ++--
 sys/arch/arm/cortex/a9tmr.c         |  6 +++---
 sys/arch/arm/cortex/gic.c           |  6 +++---
 sys/arch/arm/cortex/gtmr.c          |  6 +++---
 sys/arch/arm/gemini/gemini_icu.c    |  6 +++---
 sys/arch/arm/omap/omap2_icu.c       |  6 +++---
 sys/arch/arm/omap/omap2_prcm.c      |  6 +++---
 sys/arch/arm/samsung/mct.c          |  6 +++---
 9 files changed, 25 insertions(+), 25 deletions(-)

diffs (231 lines):

diff -r 7d37d25ec9b8 -r f05ac1337896 sys/arch/arm/broadcom/bcm53xx_cca.c
--- a/sys/arch/arm/broadcom/bcm53xx_cca.c       Thu Mar 03 06:26:14 2022 +0000
+++ b/sys/arch/arm/broadcom/bcm53xx_cca.c       Thu Mar 03 06:26:28 2022 +0000
@@ -43,7 +43,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_cca.c,v 1.4 2021/08/07 16:18:43 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_cca.c,v 1.5 2022/03/03 06:26:28 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -154,7 +154,7 @@
        struct bcmcca_softc * const sc = &bcmcca_sc;
 
        sc->sc_dev = self;
-       self->dv_private = sc;
+       device_set_private(self, sc);
 
        sc->sc_bst = bcm53xx_ioreg_bst;
 
diff -r 7d37d25ec9b8 -r f05ac1337896 sys/arch/arm/broadcom/bcm53xx_ccb.c
--- a/sys/arch/arm/broadcom/bcm53xx_ccb.c       Thu Mar 03 06:26:14 2022 +0000
+++ b/sys/arch/arm/broadcom/bcm53xx_ccb.c       Thu Mar 03 06:26:28 2022 +0000
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_ccb.c,v 1.8 2021/08/07 16:18:43 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_ccb.c,v 1.9 2022/03/03 06:26:28 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -168,7 +168,7 @@
        struct bcmccb_softc * const sc = &bcmccb_sc;
 
        sc->sc_dev = self;
-       self->dv_private = sc;
+       device_set_private(self, sc);
 
        sc->sc_bst = bcm53xx_ioreg_bst;
 
diff -r 7d37d25ec9b8 -r f05ac1337896 sys/arch/arm/cortex/a9tmr.c
--- a/sys/arch/arm/cortex/a9tmr.c       Thu Mar 03 06:26:14 2022 +0000
+++ b/sys/arch/arm/cortex/a9tmr.c       Thu Mar 03 06:26:28 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: a9tmr.c,v 1.21 2020/12/02 14:20:20 wiz Exp $   */
+/*     $NetBSD: a9tmr.c,v 1.22 2022/03/03 06:26:28 riastradh Exp $     */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: a9tmr.c,v 1.21 2020/12/02 14:20:20 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: a9tmr.c,v 1.22 2022/03/03 06:26:28 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -139,7 +139,7 @@
        }
        aprint_normal(": %s Global 64-bit Timer (%s)\n", cpu_type, freqbuf);
 
-       self->dv_private = sc;
+       device_set_private(self, sc);
        sc->sc_dev = self;
        sc->sc_memt = mpcaa->mpcaa_memt;
        sc->sc_memh = mpcaa->mpcaa_memh;
diff -r 7d37d25ec9b8 -r f05ac1337896 sys/arch/arm/cortex/gic.c
--- a/sys/arch/arm/cortex/gic.c Thu Mar 03 06:26:14 2022 +0000
+++ b/sys/arch/arm/cortex/gic.c Thu Mar 03 06:26:28 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gic.c,v 1.52 2022/01/02 11:20:03 riastradh Exp $       */
+/*     $NetBSD: gic.c,v 1.53 2022/03/03 06:26:28 riastradh Exp $       */
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -35,7 +35,7 @@
 #define _INTR_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.52 2022/01/02 11:20:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.53 2022/03/03 06:26:28 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -612,7 +612,7 @@
        struct mpcore_attach_args * const mpcaa = aux;
 
        sc->sc_dev = self;
-       self->dv_private = sc;
+       device_set_private(self, sc);
 
        sc->sc_memt = mpcaa->mpcaa_memt;        /* provided for us */
        bus_space_subregion(sc->sc_memt, mpcaa->mpcaa_memh, mpcaa->mpcaa_off1,
diff -r 7d37d25ec9b8 -r f05ac1337896 sys/arch/arm/cortex/gtmr.c
--- a/sys/arch/arm/cortex/gtmr.c        Thu Mar 03 06:26:14 2022 +0000
+++ b/sys/arch/arm/cortex/gtmr.c        Thu Mar 03 06:26:28 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gtmr.c,v 1.48 2021/11/13 18:30:27 jakllsch Exp $       */
+/*     $NetBSD: gtmr.c,v 1.49 2022/03/03 06:26:28 riastradh Exp $      */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gtmr.c,v 1.48 2021/11/13 18:30:27 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gtmr.c,v 1.49 2022/03/03 06:26:28 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -139,7 +139,7 @@
                aprint_debug_dev(self, "enabling Allwinner A64 timer workaround\n");
        }
 
-       self->dv_private = sc;
+       device_set_private(self, sc);
        sc->sc_dev = self;
 
 #ifdef DIAGNOSTIC
diff -r 7d37d25ec9b8 -r f05ac1337896 sys/arch/arm/gemini/gemini_icu.c
--- a/sys/arch/arm/gemini/gemini_icu.c  Thu Mar 03 06:26:14 2022 +0000
+++ b/sys/arch/arm/gemini/gemini_icu.c  Thu Mar 03 06:26:28 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gemini_icu.c,v 1.6 2020/09/26 10:06:25 skrll Exp $     */
+/*     $NetBSD: gemini_icu.c,v 1.7 2022/03/03 06:26:29 riastradh Exp $ */
 
 /* adapted from:
  *     NetBSD: omap2_icu.c,v 1.4 2008/08/27 11:03:10 matt Exp
@@ -36,7 +36,7 @@
 #define _INTR_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_icu.c,v 1.6 2020/09/26 10:06:25 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_icu.c,v 1.7 2022/03/03 06:26:29 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/evcnt.h>
@@ -262,7 +262,7 @@
        INTC_WRITE(sc, GEMINI_ICU_IRQ_TRIGLEVEL, 0xffffffff);
 
        sc->sc_dev = self;
-       self->dv_private = sc;
+       device_set_private(self, sc);
 
        pic_add(&sc->sc_pic, 0);
 }
diff -r 7d37d25ec9b8 -r f05ac1337896 sys/arch/arm/omap/omap2_icu.c
--- a/sys/arch/arm/omap/omap2_icu.c     Thu Mar 03 06:26:14 2022 +0000
+++ b/sys/arch/arm/omap/omap2_icu.c     Thu Mar 03 06:26:28 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: omap2_icu.c,v 1.11 2020/09/26 10:06:26 skrll Exp $     */
+/*     $NetBSD: omap2_icu.c,v 1.12 2022/03/03 06:26:29 riastradh Exp $ */
 /*
  * Define the SDP2430 specific information and then include the generic OMAP
  * interrupt header.
@@ -30,7 +30,7 @@
 #define _INTR_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2_icu.c,v 1.11 2020/09/26 10:06:26 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_icu.c,v 1.12 2022/03/03 06:26:29 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/evcnt.h>
@@ -207,7 +207,7 @@
        INTC_WRITE(sc, 2, INTC_MIR_SET, 0xffffffff);
 
        sc->sc_dev = self;
-       self->dv_private = sc;
+       device_set_private(self, sc);
 
        pic_add(&sc->sc_pic, 0);
 }
diff -r 7d37d25ec9b8 -r f05ac1337896 sys/arch/arm/omap/omap2_prcm.c
--- a/sys/arch/arm/omap/omap2_prcm.c    Thu Mar 03 06:26:14 2022 +0000
+++ b/sys/arch/arm/omap/omap2_prcm.c    Thu Mar 03 06:26:28 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: omap2_prcm.c,v 1.5 2013/06/29 20:19:54 matt Exp $      */
+/*     $NetBSD: omap2_prcm.c,v 1.6 2022/03/03 06:26:29 riastradh Exp $ */
 
 /*-
  * Copyright (c) 2010 Adam Hoka
@@ -28,7 +28,7 @@
 
 #include "opt_omap.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap2_prcm.c,v 1.5 2013/06/29 20:19:54 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap2_prcm.c,v 1.6 2022/03/03 06:26:29 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -82,7 +82,7 @@
 
        KASSERT(prcm_sc.sc_dev == NULL);
 
-       self->dv_private = &prcm_sc;
+       device_set_private(self, &prcm_sc);
        prcm_sc.sc_dev = self;
 
        prcm_sc.sc_base = obio->obio_addr;
diff -r 7d37d25ec9b8 -r f05ac1337896 sys/arch/arm/samsung/mct.c
--- a/sys/arch/arm/samsung/mct.c        Thu Mar 03 06:26:14 2022 +0000
+++ b/sys/arch/arm/samsung/mct.c        Thu Mar 03 06:26:28 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mct.c,v 1.20 2021/08/07 16:18:45 thorpej Exp $ */
+/*     $NetBSD: mct.c,v 1.21 2022/03/03 06:26:29 riastradh Exp $       */
 
 /*-
  * Copyright (c) 2014-2018 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: mct.c,v 1.20 2021/08/07 16:18:45 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: mct.c,v 1.21 2022/03/03 06:26:29 riastradh Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -252,7 +252,7 @@
                return;
        }
 
-       self->dv_private = sc;
+       device_set_private(self, sc);
        sc->sc_dev = self;
        sc->sc_phandle = faa->faa_phandle;
        sc->sc_bst = faa->faa_bst;