Module Name: src
Committed By: riastradh
Date: Sat Feb 12 17:09:44 UTC 2022
Modified Files:
src/sys/arch/arm/omap: omapl1x_timer.c omapl1x_tipb.c
src/sys/arch/vax/uba: qvkbd.c
src/sys/arch/vax/vsa: lcg.c
src/sys/dev/marvell: mvspi.c
Log Message:
sys: Omit vestigial struct devices in softcs after device_t split.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/omap/omapl1x_timer.c \
src/sys/arch/arm/omap/omapl1x_tipb.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/vax/uba/qvkbd.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/vax/vsa/lcg.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/marvell/mvspi.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/omap/omapl1x_timer.c
diff -u src/sys/arch/arm/omap/omapl1x_timer.c:1.3 src/sys/arch/arm/omap/omapl1x_timer.c:1.4
--- src/sys/arch/arm/omap/omapl1x_timer.c:1.3 Sat Feb 12 03:24:34 2022
+++ src/sys/arch/arm/omap/omapl1x_timer.c Sat Feb 12 17:09:43 2022
@@ -25,7 +25,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omapl1x_timer.c,v 1.3 2022/02/12 03:24:34 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omapl1x_timer.c,v 1.4 2022/02/12 17:09:43 riastradh Exp $");
#include "opt_timer.h"
@@ -61,7 +61,6 @@ typedef struct timer_factors {
} timer_factors_t;
typedef struct omapl1xtmr_softc {
- struct device sc_dev;
uint sc_timerno;
uint sc_timer_freq;
bus_space_tag_t sc_iot;
Index: src/sys/arch/arm/omap/omapl1x_tipb.c
diff -u src/sys/arch/arm/omap/omapl1x_tipb.c:1.3 src/sys/arch/arm/omap/omapl1x_tipb.c:1.4
--- src/sys/arch/arm/omap/omapl1x_tipb.c:1.3 Sat Aug 7 16:18:45 2021
+++ src/sys/arch/arm/omap/omapl1x_tipb.c Sat Feb 12 17:09:43 2022
@@ -97,7 +97,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omapl1x_tipb.c,v 1.3 2021/08/07 16:18:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omapl1x_tipb.c,v 1.4 2022/02/12 17:09:43 riastradh Exp $");
#include "locators.h"
@@ -121,7 +121,6 @@ __KERNEL_RCSID(0, "$NetBSD: omapl1x_tipb
#include <arm/omap/omap_var.h>
struct tipb_softc {
- struct device sc_dev;
bus_dma_tag_t sc_dmac;
};
Index: src/sys/arch/vax/uba/qvkbd.c
diff -u src/sys/arch/vax/uba/qvkbd.c:1.5 src/sys/arch/vax/uba/qvkbd.c:1.6
--- src/sys/arch/vax/uba/qvkbd.c:1.5 Sat Aug 7 16:19:07 2021
+++ src/sys/arch/vax/uba/qvkbd.c Sat Feb 12 17:09:43 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: qvkbd.c,v 1.5 2021/08/07 16:19:07 thorpej Exp $ */
+/* $NetBSD: qvkbd.c,v 1.6 2022/02/12 17:09:43 riastradh Exp $ */
/* Copyright (c) 2015 Charles H. Dickman. All rights reserved.
* Derived from dzkbd.c
@@ -81,8 +81,6 @@ struct qvkbd_internal {
struct qvkbd_internal qvkbd_console_internal;
struct qvkbd_softc {
- struct device qvkbd_dev; /* required first: base device */
-
struct qvkbd_internal *sc_itl;
int sc_enabled;
Index: src/sys/arch/vax/vsa/lcg.c
diff -u src/sys/arch/vax/vsa/lcg.c:1.8 src/sys/arch/vax/vsa/lcg.c:1.9
--- src/sys/arch/vax/vsa/lcg.c:1.8 Sat Feb 12 03:24:35 2022
+++ src/sys/arch/vax/vsa/lcg.c Sat Feb 12 17:09:43 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: lcg.c,v 1.8 2022/02/12 03:24:35 riastradh Exp $ */
+/* $NetBSD: lcg.c,v 1.9 2022/02/12 17:09:43 riastradh Exp $ */
/*
* LCG accelerated framebuffer driver
* Copyright (c) 2003, 2004 Blaz Antonic
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lcg.c,v 1.8 2022/02/12 03:24:35 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lcg.c,v 1.9 2022/02/12 17:09:43 riastradh Exp $");
#define LCG_NO_ACCEL
@@ -105,7 +105,6 @@ static int lcg_match(struct device *, st
static void lcg_attach(struct device *, struct device *, void *);
struct lcg_softc {
- struct device ss_dev;
bus_dmamap_t sc_dm;
};
Index: src/sys/dev/marvell/mvspi.c
diff -u src/sys/dev/marvell/mvspi.c:1.7 src/sys/dev/marvell/mvspi.c:1.8
--- src/sys/dev/marvell/mvspi.c:1.7 Sat Aug 7 16:19:13 2021
+++ src/sys/dev/marvell/mvspi.c Sat Feb 12 17:09:44 2022
@@ -53,7 +53,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
extern uint32_t mvTclk;
struct mvspi_softc {
- struct device sc_dev;
struct spi_controller sc_spi;
void *sc_ih;
bool sc_interrupts;
