git: e3d2108a6e90 - main - bus: Change a few bus drivers to use consistent IVAR ranges

The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=e3d2108a6e90098010c62638ab9f8bdf974e2c39

commit e3d2108a6e90098010c62638ab9f8bdf974e2c39
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2026-02-17 20:45:25 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2026-02-17 20:45:25 +0000

    bus: Change a few bus drivers to use consistent IVAR ranges
    
    A few bus drivers used 1 instead of 0 as the starting index of their
    private IVARs.  Fix those drivers to start at BUS_IVARS_PRIVATE for
    consistency.
    
    Differential Revision:  https://reviews.freebsd.org/D54934
---
 sys/dev/quicc/quicc_bus.h | 2 +-
 sys/dev/virtio/virtio.h   | 2 +-
 sys/sys/cpu.h             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/dev/quicc/quicc_bus.h b/sys/dev/quicc/quicc_bus.h
index 385c24b93f01..4c8bcd4210d4 100644
--- a/sys/dev/quicc/quicc_bus.h
+++ b/sys/dev/quicc/quicc_bus.h
@@ -30,7 +30,7 @@
 #define	_DEV_QUICC_BUS_H_
 
 enum {
-	QUICC_IVAR_CLOCK = BUS_IVARS_PRIVATE + 1,	/* The CPM clock. */
+	QUICC_IVAR_CLOCK = BUS_IVARS_PRIVATE,	/* The CPM clock. */
 	QUICC_IVAR_BRGCLK,		/* The BRG clock affected by SCCR. */
 	QUICC_IVAR_DEVTYPE
 };
diff --git a/sys/dev/virtio/virtio.h b/sys/dev/virtio/virtio.h
index 6266dc29b94c..1b8dc630e339 100644
--- a/sys/dev/virtio/virtio.h
+++ b/sys/dev/virtio/virtio.h
@@ -54,7 +54,7 @@ struct vq_alloc_info;
  * VirtIO instance variables indices.
  */
 enum {
-	VIRTIO_IVAR_DEVTYPE = BUS_IVARS_PRIVATE + 1,
+	VIRTIO_IVAR_DEVTYPE = BUS_IVARS_PRIVATE,
 	VIRTIO_IVAR_FEATURE_DESC,
 	VIRTIO_IVAR_VENDOR,
 	VIRTIO_IVAR_DEVICE,
diff --git a/sys/sys/cpu.h b/sys/sys/cpu.h
index 24c7ec6aacfe..21e79e6db6a4 100644
--- a/sys/sys/cpu.h
+++ b/sys/sys/cpu.h
@@ -36,7 +36,7 @@
  */
 
 enum {
-	CPU_IVAR_PCPU = BUS_IVARS_PRIVATE + 1,
+	CPU_IVAR_PCPU = BUS_IVARS_PRIVATE,
 	CPU_IVAR_NOMINAL_MHZ,
 	CPU_IVAR_CPUID_SIZE,
 	CPU_IVAR_CPUID