Module Name: src
Committed By: riastradh
Date: Thu Mar 3 06:26:29 UTC 2022
Modified Files:
src/sys/arch/arm/broadcom: bcm53xx_cca.c bcm53xx_ccb.c
src/sys/arch/arm/cortex: a9tmr.c gic.c gtmr.c
src/sys/arch/arm/gemini: gemini_icu.c
src/sys/arch/arm/omap: omap2_icu.c omap2_prcm.c
src/sys/arch/arm/samsung: mct.c
Log Message:
arm: Use device_set_private for various drivers.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/broadcom/bcm53xx_cca.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/broadcom/bcm53xx_ccb.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/cortex/a9tmr.c
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/arm/cortex/gic.c
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/arm/cortex/gtmr.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/gemini/gemini_icu.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/omap/omap2_icu.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/omap/omap2_prcm.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/samsung/mct.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/broadcom/bcm53xx_cca.c
diff -u src/sys/arch/arm/broadcom/bcm53xx_cca.c:1.4 src/sys/arch/arm/broadcom/bcm53xx_cca.c:1.5
--- src/sys/arch/arm/broadcom/bcm53xx_cca.c:1.4 Sat Aug 7 16:18:43 2021
+++ src/sys/arch/arm/broadcom/bcm53xx_cca.c Thu Mar 3 06:26:28 2022
@@ -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 @@ bcmcca_mainbus_attach(device_t parent, d
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;
Index: src/sys/arch/arm/broadcom/bcm53xx_ccb.c
diff -u src/sys/arch/arm/broadcom/bcm53xx_ccb.c:1.8 src/sys/arch/arm/broadcom/bcm53xx_ccb.c:1.9
--- src/sys/arch/arm/broadcom/bcm53xx_ccb.c:1.8 Sat Aug 7 16:18:43 2021
+++ src/sys/arch/arm/broadcom/bcm53xx_ccb.c Thu Mar 3 06:26:28 2022
@@ -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 @@ bcmccb_mainbus_attach(device_t parent, d
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;
Index: src/sys/arch/arm/cortex/a9tmr.c
diff -u src/sys/arch/arm/cortex/a9tmr.c:1.21 src/sys/arch/arm/cortex/a9tmr.c:1.22
--- src/sys/arch/arm/cortex/a9tmr.c:1.21 Wed Dec 2 14:20:20 2020
+++ src/sys/arch/arm/cortex/a9tmr.c Thu Mar 3 06:26:28 2022
@@ -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 @@ a9tmr_attach(device_t parent, device_t s
}
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;
Index: src/sys/arch/arm/cortex/gic.c
diff -u src/sys/arch/arm/cortex/gic.c:1.52 src/sys/arch/arm/cortex/gic.c:1.53
--- src/sys/arch/arm/cortex/gic.c:1.52 Sun Jan 2 11:20:03 2022
+++ src/sys/arch/arm/cortex/gic.c Thu Mar 3 06:26:28 2022
@@ -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 @@ armgic_attach(device_t parent, device_t
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,
Index: src/sys/arch/arm/cortex/gtmr.c
diff -u src/sys/arch/arm/cortex/gtmr.c:1.48 src/sys/arch/arm/cortex/gtmr.c:1.49
--- src/sys/arch/arm/cortex/gtmr.c:1.48 Sat Nov 13 18:30:27 2021
+++ src/sys/arch/arm/cortex/gtmr.c Thu Mar 3 06:26:28 2022
@@ -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 @@ gtmr_attach(device_t parent, device_t se
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
Index: src/sys/arch/arm/gemini/gemini_icu.c
diff -u src/sys/arch/arm/gemini/gemini_icu.c:1.6 src/sys/arch/arm/gemini/gemini_icu.c:1.7
--- src/sys/arch/arm/gemini/gemini_icu.c:1.6 Sat Sep 26 10:06:25 2020
+++ src/sys/arch/arm/gemini/gemini_icu.c Thu Mar 3 06:26:29 2022
@@ -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 @@ geminiicu_attach(device_t parent, device
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);
}
Index: src/sys/arch/arm/omap/omap2_icu.c
diff -u src/sys/arch/arm/omap/omap2_icu.c:1.11 src/sys/arch/arm/omap/omap2_icu.c:1.12
--- src/sys/arch/arm/omap/omap2_icu.c:1.11 Sat Sep 26 10:06:26 2020
+++ src/sys/arch/arm/omap/omap2_icu.c Thu Mar 3 06:26:29 2022
@@ -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 @@ omap2icu_attach(device_t parent, device_
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);
}
Index: src/sys/arch/arm/omap/omap2_prcm.c
diff -u src/sys/arch/arm/omap/omap2_prcm.c:1.5 src/sys/arch/arm/omap/omap2_prcm.c:1.6
--- src/sys/arch/arm/omap/omap2_prcm.c:1.5 Sat Jun 29 20:19:54 2013
+++ src/sys/arch/arm/omap/omap2_prcm.c Thu Mar 3 06:26:29 2022
@@ -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 @@ prcm_attach(device_t parent, device_t se
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;
Index: src/sys/arch/arm/samsung/mct.c
diff -u src/sys/arch/arm/samsung/mct.c:1.20 src/sys/arch/arm/samsung/mct.c:1.21
--- src/sys/arch/arm/samsung/mct.c:1.20 Sat Aug 7 16:18:45 2021
+++ src/sys/arch/arm/samsung/mct.c Thu Mar 3 06:26:29 2022
@@ -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 @@ mct_attach(device_t parent, device_t sel
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;
