Replace all instances of "scsibus* at hba?" with a single "scsibus* at

scsi?" rule, similar to how ethernet PHY drivers attach at mii.

Discussed on icb.

4 files changed, 8 insertions, 33 deletions

diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index 8df6fb61c65..a8f68f0ee79 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.265 2011/06/22 04:33:01 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.266 2011/06/29 20:52:09 matthew Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -111,24 +111,17 @@ malo*	at pcmcia?		# Marvell 88W8385
 
 # PCI SCSI
 ahc*	at pci?			# Adaptec 2940 SCSI controllers
-scsibus* at ahc?
 siop*	at pci?			# NCR 538XX SCSI controllers
-scsibus* at siop?
 isp*	at pci?			# Qlogic ISP [12]0x0 SCSI/FibreChannel
 pcscp*	at pci?			# AMD 53c974 PCscsi-PCI SCSI
-scsibus* at pcscp?
 mpi*	at pci?			# LSI Logic Fusion MPT Message Passing Interface
-scsibus* at mpi?
 arc*	at pci?			# Areca RAID Controllers
-scsibus* at arc?
 jmb*	at pci?			# JMicron JMB36x controllers
 ahci*	at jmb? flags 0x0000	# flags 0x0001 to force SATA 1 (1.5Gb/s)
 pciide*	at jmb?
 ahci*	at pci? flags 0x0000	# AHCI SATA controllers
 				# flags 0x0001 to force SATA 1 (1.5Gb/s)
-scsibus* at ahci?
 sili*	at pci?			# Silicon Image 3124/3132/3531 SATA controllers
-scsibus* at sili?
 
 # PCI crypto
 hifn*	at pci?			# Hifn 7751/7811/7951
@@ -205,7 +198,6 @@ umidi*	at uhub?		# USB MIDI
 midi*	at umidi?
 ulpt*	at uhub?		# USB Printers
 umass*	at uhub?		# USB Mass Storage devices
-scsibus* at umass?
 uhidev*	at uhub?		# Human Interface Devices
 ums*	at uhidev?		# USB mouse
 wsmouse* at ums? mux 0
@@ -317,7 +309,6 @@ pmc*	at ebus?
 ppm*	at ebus?
 wbsd*	at ebus?
 sdmmc*	at wbsd?
-scsibus* at sdmmc?
 
 # performance counters
 uperf*	at ebus?
@@ -346,7 +337,6 @@ vcons0	at vbus?
 vrtc0	at vbus?
 vrng0	at vbus?
 vdsk*	at cbus?
-scsibus* at vdsk?
 vnet*	at cbus?
 vcc*	at cbus?
 vcctty*	at vcc?
@@ -384,7 +374,6 @@ sbpp*		at spif?
 pciide*	at pci? flags 0x0000
 wd*	at pciide? flags 0x0a00
 atapiscsi* at pciide?
-scsibus* at atapiscsi?
 
 wdc*	at pcmcia?
 wd*	at wdc? flags 0x0000
@@ -406,11 +395,10 @@ isp*	at sbus?
 
 # SCSI bus layer.  SCSI devices attach to the SCSI bus, which attaches
 # to the underlying hardware controller.
-scsibus*	at esp?
-scsibus*	at isp?
 
 # These entries find devices on all SCSI busses and assign
 # unit numers dynamically.
+scsibus*	at scsi?
 sd*		at scsibus?		# SCSI disks
 st*		at scsibus?		# SCSI tapes
 cd*		at scsibus?		# SCSI CD-ROMs
diff --git a/sys/arch/sparc64/conf/RAMDISK b/sys/arch/sparc64/conf/RAMDISK
index 9474fb77277..ae0bface68d 100644
--- a/sys/arch/sparc64/conf/RAMDISK
+++ b/sys/arch/sparc64/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.100 2011/05/24 20:27:11 matthew Exp $
+#	$OpenBSD: RAMDISK,v 1.101 2011/06/29 20:52:09 matthew Exp $
 
 # Machine architecture; required by config(8)
 machine		sparc64
@@ -132,7 +132,6 @@ vcons0	at vbus?
 vrtc0	at vbus?
 vrng0	at vbus?
 vdsk*	at cbus?
-scsibus* at vdsk?
 vnet*	at cbus?
 
 ## Lance Ethernet - AMD7990
@@ -154,7 +153,6 @@ gem*	at sbus?
 pciide*	at pci? flags 0x0000
 wd*	at pciide? flags 0x0a00
 atapiscsi* at pciide?
-scsibus* at atapiscsi?
 
 #
 # Note the flags on the esp entries below, that work around
@@ -170,9 +168,7 @@ dma*	at sbus?		# SBus
 esp*	at dma?			# SBus
 esp*	at sbus?
 isp*	at sbus?
-scsibus* at esp?
 softraid0	at root		# Software RAID
-scsibus* at softraid?
 
 ahc*	at pci?
 siop*	at pci?
@@ -185,16 +181,10 @@ ahci*	at jmb?
 pciide*	at jmb?
 ahci*	at pci?
 
-scsibus*	at ahc?
-scsibus*	at siop?
-scsibus*	at mpi?
-scsibus*	at sili?
-scsibus*	at arc?
-scsibus*	at ahci?
-scsibus*	at isp?
 
 # These entries find devices on all SCSI busses and assign
 # unit numers dynamically.
+scsibus* at scsi?
 sd*	at scsibus?		# SCSI disks
 cd*	at scsibus?		# SCSI CD-ROMs
 
@@ -244,7 +234,6 @@ uhidev*	at uhub?		# Human Interface Devices
 ukbd*	at uhidev?		# USB keyboard
 wskbd*	at ukbd?
 umass*	at uhub?		# USB Mass Storage devices
-scsibus* at umass?
 aue*	at uhub?		# ADMtek AN986 Pegasus Ethernet
 axe*	at uhub?		# ASIX Electronics AX88172 USB Ethernet
 cue*	at uhub?		# CATC USB-EL1201A based Ethernet
diff --git a/sys/arch/sparc64/conf/RAMDISKU1 b/sys/arch/sparc64/conf/RAMDISKU1
index abc8bf3c48d..2bf402554bd 100644
--- a/sys/arch/sparc64/conf/RAMDISKU1
+++ b/sys/arch/sparc64/conf/RAMDISKU1
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKU1,v 1.20 2009/07/12 19:17:50 kettenis Exp $
+#	$OpenBSD: RAMDISKU1,v 1.21 2011/06/29 20:52:09 matthew Exp $
 
 # Machine architecture; required by config(8)
 machine		sparc64
@@ -64,10 +64,10 @@ gem*		at sbus?
 dma*	at sbus?		# SBus
 esp*	at dma?			# SBus
 esp*	at sbus?
-scsibus*	at esp?
 
 # These entries find devices on all SCSI busses and assign
 # unit numers dynamically.
+scsibus* at scsi?
 sd*	at scsibus?		# SCSI disks
 #cd*	at scsibus?		# SCSI CD-ROMs
 
diff --git a/sys/arch/sparc64/conf/RAMDISKU5 b/sys/arch/sparc64/conf/RAMDISKU5
index 0c36748a2a8..ff08d1b80d6 100644
--- a/sys/arch/sparc64/conf/RAMDISKU5
+++ b/sys/arch/sparc64/conf/RAMDISKU5
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKU5,v 1.16 2009/06/24 11:38:40 deraadt Exp $
+#	$OpenBSD: RAMDISKU5,v 1.17 2011/06/29 20:52:09 matthew Exp $
 
 # Machine architecture; required by config(8)
 machine		sparc64
@@ -57,15 +57,13 @@ timer*	at mainbus0		# Timer chip (some systems)
 pciide*	at pci? flags 0x0000
 wd*	at pciide? flags 0x0a00
 atapiscsi* at pciide?
-scsibus* at atapiscsi?
 
 siop*	at pci?
-scsibus*	at siop?
 #isp*	at pci?
-#scsibus*	at isp?
 
 # These entries find devices on all SCSI busses and assign
 # unit numers dynamically.
+scsibus* at scsi?
 sd*	at scsibus?		# SCSI disks
 #cd*	at scsibus?		# SCSI CD-ROMs