From 9e7223f23d1e14e8347c8a9009d5ff850956c9a6 Mon Sep 17 00:00:00 2001
From: mycroft <mycroft@NetBSD.org>
Date: Sun, 8 Sep 1996 00:11:51 +0000
Subject: [PATCH] Use cdev_scanner_init() rather than local cdev_ss_init().

---
 sys/arch/arm32/arm32/conf.c | 11 ++---------
 sys/arch/x68k/x68k/conf.c   | 11 ++---------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/sys/arch/arm32/arm32/conf.c b/sys/arch/arm32/arm32/conf.c
index af574b033921..7d7a964ab080 100644
--- a/sys/arch/arm32/arm32/conf.c
+++ b/sys/arch/arm32/arm32/conf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: conf.c,v 1.11 1996/09/07 12:40:26 mycroft Exp $	*/
+/*	$NetBSD: conf.c,v 1.12 1996/09/08 00:11:51 mycroft Exp $	*/
 
 /*
  * Copyright (c) 1994 Mark Brinicombe.
@@ -171,13 +171,6 @@ int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
 	(dev_type_stop((*))) enodev, \
 	0, seltrue, (dev_type_mmap((*))) enodev, 0 }
 
-/* open, close, read, ioctl */
-#define cdev_ss_init(c,n) { \
-	dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
-	(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
-	(dev_type_stop((*))) enodev, 0, seltrue, \
-	(dev_type_mmap((*))) enodev }
-
 /* open, close, write, ioctl */
 #define cdev_iic_init(c,n) { \
 	dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
@@ -279,7 +272,7 @@ struct cdevsw cdevsw[] = {
 	cdev_disk_init(NCD,cd),	    	/* 26: SCSI CD-ROM */
 	cdev_ch_init(NCH,ch),	 	/* 27: SCSI autochanger */
 	cdev_ch_init(NUK,uk),	 	/* 28: SCSI unknown */
-	cdev_ss_init(NSS,ss),	 	/* 29: SCSI scanner */
+	cdev_scanner_init(NSS,ss),	/* 29: SCSI scanner */
 	cdev_lkm_dummy(),		/* 30: */
 	cdev_lkm_dummy(),		/* 31: */
 	cdev_bpftun_init(NBPFILTER,bpf),/* 32: Berkeley packet filter */
diff --git a/sys/arch/x68k/x68k/conf.c b/sys/arch/x68k/x68k/conf.c
index 20db0efe198c..5fa47b31886f 100644
--- a/sys/arch/x68k/x68k/conf.c
+++ b/sys/arch/x68k/x68k/conf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: conf.c,v 1.5 1996/09/07 12:40:42 mycroft Exp $	*/
+/*	$NetBSD: conf.c,v 1.6 1996/09/08 00:11:52 mycroft Exp $	*/
 
 /*-
  * Copyright (c) 1991 The Regents of the University of California.
@@ -129,13 +129,6 @@ int	nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
 	(dev_type_stop((*))) nullop, 0, (dev_type_poll((*))) enodev, \
 	(dev_type_mmap((*))) enodev }
 
-/* open, close, read, ioctl */
-#define cdev_ss_init(c,n) { \
-	dev_init(c,n,open), dev_init(c,n,close), dev_init(c,n,read), \
-	(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
-	(dev_type_stop((*))) enodev, 0, seltrue, \
-	(dev_type_mmap((*))) enodev }
-
 cdev_decl(cn);
 cdev_decl(ctty);
 #define	mmread	mmrw
@@ -227,7 +220,7 @@ struct cdevsw	cdevsw[] =
 	cdev_pow_init(NPOW,pow),	/* 32: power switch device */
 	cdev_bell_init(NBELL,bell),	/* 33: opm bell device */
 	cdev_disk_init(NCCD,ccd),	/* 34: concatenated disk driver */
-	cdev_ss_init(NSS,ss),		/* 35: SCSI scanner */
+	cdev_scanner_init(NSS,ss),	/* 35: SCSI scanner */
 };
 int	nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);