Module Name: src
Committed By: cegger
Date: Thu May 7 22:17:41 UTC 2009
Modified Files:
src/sys/sys: device.h
Log Message:
CFATTACH_DECL2 is no longer used. remove it.
ok dyoung@
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/sys/device.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/device.h
diff -u src/sys/sys/device.h:1.118 src/sys/sys/device.h:1.119
--- src/sys/sys/device.h:1.118 Tue May 5 21:40:25 2009
+++ src/sys/sys/device.h Thu May 7 22:17:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: device.h,v 1.118 2009/05/05 21:40:25 cegger Exp $ */
+/* $NetBSD: device.h,v 1.119 2009/05/07 22:17:41 cegger Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -300,8 +300,7 @@
};
LIST_HEAD(cfattachlist, cfattach);
-#define CFATTACH_DECL2(name, ddsize, matfn, attfn, detfn, actfn, \
- rescanfn, chdetfn) \
+#define CFATTACH_DECL(name, ddsize, matfn, attfn, detfn, actfn) \
struct cfattach __CONCAT(name,_ca) = { \
.ca_name = ___STRING(name), \
.ca_devsize = ddsize, \
@@ -310,13 +309,10 @@
.ca_attach = attfn, \
.ca_detach = detfn, \
.ca_activate = actfn, \
- .ca_rescan = rescanfn, \
- .ca_childdetached = chdetfn, \
+ .ca_rescan = NULL, \
+ .ca_childdetached = NULL, \
}
-#define CFATTACH_DECL(name, ddsize, matfn, attfn, detfn, actfn) \
- CFATTACH_DECL2(name, ddsize, matfn, attfn, detfn, actfn, NULL, NULL)
-
#define CFATTACH_DECL3_NEW(name, ddsize, matfn, attfn, detfn, actfn, \
rescanfn, chdetfn, __flags) \
struct cfattach __CONCAT(name,_ca) = { \
