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, 43 deletions

diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 23c906a21f3..7b929dd1334 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.222 2011/05/24 20:27:11 matthew Exp $
+#	$OpenBSD: GENERIC,v 1.223 2011/06/29 20:52:08 matthew Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -90,7 +90,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
@@ -162,7 +161,6 @@ scc0	at	ioasic?
 scc1	at	ioasic?
 tcds*	at	tc?
 asc*	at	tcds?
-scsibus* at asc?
 asc*	at	tc?
 #cfb*	at	tc?
 #sfb*	at	tc?
@@ -195,31 +193,19 @@ cy*	at pci?				# PCI cyclom card
 
 # PCI SCSI devices
 ahc*	at pci?				# Adaptec 2940 SCSI controllers
-scsibus* at ahc?
 isp*	at pci?				# Qlogic ISP [12]0x0 SCSI/FibreChannel
-scsibus* at isp?
 siop*	at pci?				# NCR 53c8xx SCSI
-scsibus* at siop?
 pcscp*	at pci?				# AMD 53c974 PCscsi-PCI SCSI
-scsibus* at pcscp?
 twe*	at pci?				# 3ware Escalade RAID controllers
-scsibus* at twe?
 mpi*	at pci?				# LSI Logic Message Passing Interface
-scsibus* at mpi?
 sili*	at pci?				# Silicon Image 3124/3132/3531 SATA
-scsibus* at sili?
 
 #UNTESTED: the following drivers are untested.
 adw*	at pci?				# AdvanSys ULTRA WIDE SCSI
-scsibus* at adw?
 ciss*	at pci?				# Compaq Smart ARRAY [56]* RAID controllers
-scsibus* at ciss?
 gdt*	at pci?				# ICP Vortex GDT RAID controllers
-scsibus* at gdt?
 #adv*	at pci?				# AdvanSys 1200A/B and ULTRA SCSI
-#scsibus* at adv?
 #ami*	at pci?				# AMI MegaRAID controllers
-#scsibus*	at ami?
 
 # Networking devices
 lmc*	at pci?				# Lan Media Corp SSI/T3/HSSI
@@ -355,7 +341,6 @@ fdc0	at isa? port 0x3f0 irq 6 drq 2	# floppy controller
 fd*	at fdc?
 
 #aic0	at isa? port 0x340 irq 11	# Adaptec 152[02] SCSI
-#scsibus* at aic?
 
 # option for using CD1400 handshaking for incoming data
 # requires a special cable that exchanges the RTS and DTR lines
@@ -367,6 +352,7 @@ fea*	at eisa?			# DEC DEFEA FDDI cards
 ahc*	at eisa?			# Adaptec 274x, aic7770 SCSI
 
 # SCSI devices
+scsibus* at scsi?
 cd*	at scsibus?
 sd*	at scsibus?
 st*	at scsibus?
@@ -385,7 +371,6 @@ wd*	at pciide? flags 0x0000
 # ATAPI<->SCSI
 atapiscsi* at wdc?
 atapiscsi* at pciide?
-scsibus* at atapiscsi?
 
 # Audio devices
 cmpci*	at pci?				# C-Media CMI8338/8738
diff --git a/sys/arch/alpha/conf/RAMDISK b/sys/arch/alpha/conf/RAMDISK
index 4eba29d4fb4..8015a47cca7 100644
--- a/sys/arch/alpha/conf/RAMDISK
+++ b/sys/arch/alpha/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.70 2009/06/24 11:38:39 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.71 2011/06/29 20:52:08 matthew Exp $
 #	$NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $
 
 machine	alpha			# architecture, used by config; REQUIRED
@@ -138,14 +138,11 @@ wd*	at pciide? flags 0x0000
 
 #atapiscsi* at wdc?
 #atapiscsi* at pciide?
-#scsibus* at atapiscsi?
 
 # SCSI bus support
-#scsibus* at	asc?
-scsibus* at	siop?
-scsibus* at	isp?
 
 # SCSI devices
+scsibus* at scsi?
 #cd*	at scsibus?			# SCSI CD-ROM drives
 sd*	at scsibus?			# SCSI disk drives
 #st*	at scsibus?			# SCSI tape drives
diff --git a/sys/arch/alpha/conf/RAMDISKB b/sys/arch/alpha/conf/RAMDISKB
index 8590ef0a816..95f81e48248 100644
--- a/sys/arch/alpha/conf/RAMDISKB
+++ b/sys/arch/alpha/conf/RAMDISKB
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKB,v 1.36 2009/06/25 13:06:16 deraadt Exp $
+#	$OpenBSD: RAMDISKB,v 1.37 2011/06/29 20:52:08 matthew Exp $
 #	$NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $
 
 machine	alpha			# architecture, used by config; REQUIRED
@@ -133,15 +133,11 @@ wd*	at pciide? flags 0x0000
 
 #atapiscsi* at wdc?
 #atapiscsi* at pciide?
-#scsibus* at atapiscsi?
 
 # SCSI bus support
-#scsibus* at asc?
-scsibus* at ahc?
-scsibus* at siop?
-scsibus* at isp?
 
 # SCSI devices
+scsibus* at scsi?
 #cd*	at scsibus?			# SCSI CD-ROM drives
 sd*	at scsibus?			# SCSI disk drives
 #st*	at scsibus?			# SCSI tape drives
diff --git a/sys/arch/alpha/conf/RAMDISKBIG b/sys/arch/alpha/conf/RAMDISKBIG
index f10a801e7f1..d26bfe1b5ac 100644
--- a/sys/arch/alpha/conf/RAMDISKBIG
+++ b/sys/arch/alpha/conf/RAMDISKBIG
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKBIG,v 1.83 2011/05/24 20:27:11 matthew Exp $
+#	$OpenBSD: RAMDISKBIG,v 1.84 2011/06/29 20:52:08 matthew Exp $
 #	$NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
 #
 # Generic Alpha kernel.  Enough to get booted, etc., but not much more.
@@ -78,7 +78,6 @@ uhid*	at uhidev?			# USB Generic HID devices
 
 # USB Mass Storage devices
 umass*	at uhub?
-scsibus* at umass?
 
 # USB Modems
 #umodem*	at uhub?
@@ -126,7 +125,6 @@ scc1	at ioasic?
 tcds*	at tc?
 asc*	at tcds?
 asc*	at tc?
-scsibus* at asc?
 #cfb*	at tc?
 #sfb*	at tc?
 le*	at tc?
@@ -159,27 +157,17 @@ cy*	at pci?				# PCI cyclom card
 
 # PCI SCSI devices
 ahc*	at pci?				# Adaptec 2940 SCSI controllers
-scsibus* at ahc?
 isp*	at pci?				# Qlogic ISP [12]0x0 SCSI/FibreChannel
-scsibus* at isp?
 siop*	at pci?				# NCR 53c8xx SCSI
-scsibus* at siop?
 pcscp*	at pci?				# AMD 53c974 PCscsi-PCI SCSI
-scsibus* at pcscp?
 twe*	at pci?				# 3ware Escalade RAID controllers
-scsibus* at twe?
 softraid0	at root			# Software RAID
-scsibus* at softraid?
 
 #UNTESTED: the following drivers are untested.
 adw*	at pci?				# AdvanSys ULTRA WIDE SCSI
-scsibus* at adw?
 ciss*	at pci?				# Compaq Smart ARRAY [56]* RAID controllers
-scsibus* at ciss?
 gdt*	at pci?				# ICP Vortex GDT RAID controllers
-scsibus* at gdt?
 #adv*	at pci?				# AdvanSys 1200A/B and ULTRA SCSI
-#scsibus* at adv?
 
 # PCI Network devices
 pcn*	at pci?				# AMD PCnet-PCI Ethernet
@@ -283,7 +271,6 @@ lc1	at isa? port 0x280		# DEC EtherWorks
 cy0	at isa? iomem 0xd4000 irq 12	# ISA cyclom card
 
 #aic0	at isa? port 0x340 irq 11	# Adaptec 152[02] SCSI
-#scsibus* at aic?
 
 #ahc0	at isa?				# Adaptec 284x SCSI controllers
 
@@ -292,6 +279,7 @@ fea*	at eisa?			# DEC DEFEA FDDI cards
 ahc*	at eisa?			# Adaptec 274x, aic7770 SCSI
 
 # SCSI devices
+scsibus* at scsi?
 cd*	at scsibus?
 sd*	at scsibus?
 st*	at scsibus?
@@ -308,7 +296,6 @@ wd*	at pciide? flags 0x0000
 # ATAPI<->SCSI
 #atapiscsi* at wdc?
 atapiscsi* at pciide?
-scsibus* at atapiscsi?
 
 # Workstation Console attachments
 #wsdisplay*	at cfb?