Module Name: src
Committed By: dyoung
Date: Sun Dec 6 22:48:17 UTC 2009
Modified Files:
src/sys/dev/scsipi: cd.c ss.c st.c st_atapi.c st_scsi.c stvar.h uk.c
Log Message:
Delete do-nothing device-activation hooks.
To generate a diff of this commit:
cvs rdiff -u -r1.295 -r1.296 src/sys/dev/scsipi/cd.c
cvs rdiff -u -r1.79 -r1.80 src/sys/dev/scsipi/ss.c
cvs rdiff -u -r1.215 -r1.216 src/sys/dev/scsipi/st.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/scsipi/st_atapi.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/scsipi/st_scsi.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/scsipi/stvar.h
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/scsipi/uk.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/dev/scsipi/cd.c
diff -u src/sys/dev/scsipi/cd.c:1.295 src/sys/dev/scsipi/cd.c:1.296
--- src/sys/dev/scsipi/cd.c:1.295 Wed Oct 21 21:12:05 2009
+++ src/sys/dev/scsipi/cd.c Sun Dec 6 22:48:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.c,v 1.295 2009/10/21 21:12:05 rmind Exp $ */
+/* $NetBSD: cd.c,v 1.296 2009/12/06 22:48:17 dyoung Exp $ */
/*-
* Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation,
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.295 2009/10/21 21:12:05 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd.c,v 1.296 2009/12/06 22:48:17 dyoung Exp $");
#include "rnd.h"
@@ -171,7 +171,6 @@
static int cdmatch(device_t, cfdata_t, void *);
static void cdattach(device_t, device_t, void *);
-static int cdactivate(device_t, enum devact);
static int cddetach(device_t, int);
static int mmc_getdiscinfo(struct scsipi_periph *, struct mmc_discinfo *);
@@ -182,7 +181,7 @@
static void cd_set_properties(struct cd_softc *);
CFATTACH_DECL3_NEW(cd, sizeof(struct cd_softc), cdmatch, cdattach, cddetach,
- cdactivate, NULL, NULL, DVF_DETACH_SHUTDOWN);
+ NULL, NULL, NULL, DVF_DETACH_SHUTDOWN);
extern struct cfdriver cd_cd;
@@ -299,25 +298,6 @@
}
static int
-cdactivate(device_t self, enum devact act)
-{
- int rv = 0;
-
- switch (act) {
- case DVACT_ACTIVATE:
- rv = EOPNOTSUPP;
- break;
-
- case DVACT_DEACTIVATE:
- /*
- * Nothing to do; we key off the device's DVF_ACTIVE.
- */
- break;
- }
- return (rv);
-}
-
-static int
cddetach(device_t self, int flags)
{
struct cd_softc *cd = device_private(self);
Index: src/sys/dev/scsipi/ss.c
diff -u src/sys/dev/scsipi/ss.c:1.79 src/sys/dev/scsipi/ss.c:1.80
--- src/sys/dev/scsipi/ss.c:1.79 Mon Nov 23 02:13:47 2009
+++ src/sys/dev/scsipi/ss.c Sun Dec 6 22:48:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ss.c,v 1.79 2009/11/23 02:13:47 rmind Exp $ */
+/* $NetBSD: ss.c,v 1.80 2009/12/06 22:48:17 dyoung Exp $ */
/*
* Copyright (c) 1995 Kenneth Stailey. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.79 2009/11/23 02:13:47 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ss.c,v 1.80 2009/12/06 22:48:17 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -71,10 +71,9 @@
static int ssmatch(device_t, cfdata_t, void *);
static void ssattach(device_t, device_t, void *);
static int ssdetach(device_t self, int flags);
-static int ssactivate(device_t self, enum devact act);
CFATTACH_DECL(ss, sizeof(struct ss_softc),
- ssmatch, ssattach, ssdetach, ssactivate);
+ ssmatch, ssattach, ssdetach, NULL);
extern struct cfdriver ss_cd;
@@ -215,25 +214,6 @@
return (0);
}
-static int
-ssactivate(device_t self, enum devact act)
-{
- int rv = 0;
-
- switch (act) {
- case DVACT_ACTIVATE:
- rv = EOPNOTSUPP;
- break;
-
- case DVACT_DEACTIVATE:
- /*
- * Nothing to do; we key off the device's DVF_ACTIVE.
- */
- break;
- }
- return (rv);
-}
-
/*
* open the device.
*/
Index: src/sys/dev/scsipi/st.c
diff -u src/sys/dev/scsipi/st.c:1.215 src/sys/dev/scsipi/st.c:1.216
--- src/sys/dev/scsipi/st.c:1.215 Sat Dec 5 22:34:43 2009
+++ src/sys/dev/scsipi/st.c Sun Dec 6 22:48:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: st.c,v 1.215 2009/12/05 22:34:43 pooka Exp $ */
+/* $NetBSD: st.c,v 1.216 2009/12/06 22:48:17 dyoung Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.215 2009/12/05 22:34:43 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.216 2009/12/06 22:48:17 dyoung Exp $");
#include "opt_scsi.h"
@@ -417,25 +417,6 @@
}
int
-stactivate(device_t self, enum devact act)
-{
- int rv = 0;
-
- switch (act) {
- case DVACT_ACTIVATE:
- rv = EOPNOTSUPP;
- break;
-
- case DVACT_DEACTIVATE:
- /*
- * Nothing to do; we key off the device's DVF_ACTIVE.
- */
- break;
- }
- return (rv);
-}
-
-int
stdetach(device_t self, int flags)
{
struct st_softc *st = device_private(self);
Index: src/sys/dev/scsipi/st_atapi.c
diff -u src/sys/dev/scsipi/st_atapi.c:1.25 src/sys/dev/scsipi/st_atapi.c:1.26
--- src/sys/dev/scsipi/st_atapi.c:1.25 Wed Oct 21 21:12:06 2009
+++ src/sys/dev/scsipi/st_atapi.c Sun Dec 6 22:48:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: st_atapi.c,v 1.25 2009/10/21 21:12:06 rmind Exp $ */
+/* $NetBSD: st_atapi.c,v 1.26 2009/12/06 22:48:17 dyoung Exp $ */
/*
* Copyright (c) 2001 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st_atapi.c,v 1.25 2009/10/21 21:12:06 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st_atapi.c,v 1.26 2009/12/06 22:48:17 dyoung Exp $");
#include "opt_scsi.h"
#include "rnd.h"
@@ -48,7 +48,7 @@
static int st_atapibus_mode_sense(struct st_softc *, int);
CFATTACH_DECL(st_atapibus, sizeof(struct st_softc),
- st_atapibus_match, st_atapibus_attach, stdetach, stactivate);
+ st_atapibus_match, st_atapibus_attach, stdetach, NULL);
static const struct scsipi_inquiry_pattern st_atapibus_patterns[] = {
{T_SEQUENTIAL, T_REMOV,
Index: src/sys/dev/scsipi/st_scsi.c
diff -u src/sys/dev/scsipi/st_scsi.c:1.31 src/sys/dev/scsipi/st_scsi.c:1.32
--- src/sys/dev/scsipi/st_scsi.c:1.31 Wed Oct 21 21:12:06 2009
+++ src/sys/dev/scsipi/st_scsi.c Sun Dec 6 22:48:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: st_scsi.c,v 1.31 2009/10/21 21:12:06 rmind Exp $ */
+/* $NetBSD: st_scsi.c,v 1.32 2009/12/06 22:48:17 dyoung Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: st_scsi.c,v 1.31 2009/10/21 21:12:06 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st_scsi.c,v 1.32 2009/12/06 22:48:17 dyoung Exp $");
#include "opt_scsi.h"
#include "rnd.h"
@@ -75,7 +75,7 @@
static int st_scsibus_cmprss(struct st_softc *, int, int);
CFATTACH_DECL(st_scsibus, sizeof(struct st_softc),
- st_scsibus_match, st_scsibus_attach, stdetach, stactivate);
+ st_scsibus_match, st_scsibus_attach, stdetach, NULL);
static const struct scsipi_inquiry_pattern st_scsibus_patterns[] = {
{T_SEQUENTIAL, T_REMOV,
Index: src/sys/dev/scsipi/stvar.h
diff -u src/sys/dev/scsipi/stvar.h:1.20 src/sys/dev/scsipi/stvar.h:1.21
--- src/sys/dev/scsipi/stvar.h:1.20 Sat Aug 15 12:44:55 2009
+++ src/sys/dev/scsipi/stvar.h Sun Dec 6 22:48:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: stvar.h,v 1.20 2009/08/15 12:44:55 pgoyette Exp $ */
+/* $NetBSD: stvar.h,v 1.21 2009/12/06 22:48:17 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -179,7 +179,6 @@
ST_2FM_AT_EOD | ST_PER_ACTION | ST_POSUPDATED)
void stattach(device_t, struct st_softc *, void *);
-int stactivate(device_t, enum devact);
int stdetach(device_t, int);
int st_mode_select(struct st_softc *, int);
Index: src/sys/dev/scsipi/uk.c
diff -u src/sys/dev/scsipi/uk.c:1.58 src/sys/dev/scsipi/uk.c:1.59
--- src/sys/dev/scsipi/uk.c:1.58 Tue May 12 14:44:31 2009
+++ src/sys/dev/scsipi/uk.c Sun Dec 6 22:48:17 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uk.c,v 1.58 2009/05/12 14:44:31 cegger Exp $ */
+/* $NetBSD: uk.c,v 1.59 2009/12/06 22:48:17 dyoung Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uk.c,v 1.58 2009/05/12 14:44:31 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uk.c,v 1.59 2009/12/06 22:48:17 dyoung Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -60,12 +60,10 @@
static int ukmatch(device_t, cfdata_t, void *);
static void ukattach(device_t, device_t, void *);
-static int ukactivate(device_t, enum devact);
static int ukdetach(device_t, int);
-CFATTACH_DECL(uk, sizeof(struct uk_softc), ukmatch, ukattach, ukdetach,
- ukactivate);
+CFATTACH_DECL(uk, sizeof(struct uk_softc), ukmatch, ukattach, ukdetach, NULL);
extern struct cfdriver uk_cd;
@@ -109,25 +107,6 @@
}
static int
-ukactivate(device_t self, enum devact act)
-{
- int rv = 0;
-
- switch (act) {
- case DVACT_ACTIVATE:
- rv = EOPNOTSUPP;
- break;
-
- case DVACT_DEACTIVATE:
- /*
- * Nothing to do; we key off the device's DVF_ACTIVE.
- */
- break;
- }
- return (rv);
-}
-
-static int
ukdetach(device_t self, int flags)
{
/*struct uk_softc *uk = device_private(self);*/
