Module Name: src
Committed By: thorpej
Date: Mon Jan 15 18:15:37 UTC 2024
Modified Files:
src/sys/sys: device.h
Log Message:
Revert unintended commit (didn't hit CTRL-C fast enough I guess).
To generate a diff of this commit:
cvs rdiff -u -r1.187 -r1.188 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.187 src/sys/sys/device.h:1.188
--- src/sys/sys/device.h:1.187 Mon Jan 15 18:14:23 2024
+++ src/sys/sys/device.h Mon Jan 15 18:15:37 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: device.h,v 1.187 2024/01/15 18:14:23 thorpej Exp $ */
+/* $NetBSD: device.h,v 1.188 2024/01/15 18:15:37 thorpej Exp $ */
/*
* Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -622,16 +622,11 @@ bool devhandle_is_valid(devhandle_t);
devhandle_t devhandle_invalid(void);
devhandle_type_t devhandle_type(devhandle_t);
int devhandle_compare(devhandle_t, devhandle_t);
-devhandle_t devhandle_subclass(devhandle_t, struct devhandle_impl *,
- device_call_t (*)(devhandle_t, const char *,
- devhandle_t *));
device_call_t devhandle_lookup_device_call(devhandle_t, const char *,
devhandle_t *);
-void devhandle_impl_subclass(struct devhandle_impl *,
- const struct devhandle_impl *,
- device_call_t (*)(devhandle_t, const char *,
- devhandle_t *));
+void devhandle_impl_inherit(struct devhandle_impl *,
+ const struct devhandle_impl *);
device_t deviter_first(deviter_t *, deviter_flags_t);
void deviter_init(deviter_t *, deviter_flags_t);
@@ -722,13 +717,10 @@ struct device_call_generic {
void *args;
};
-int device_call_generic(device_t, devhandle_t,
- const struct device_call_generic *);
+int device_call_generic(device_t, const struct device_call_generic *);
#define device_call(dev, call) \
- device_call_generic((dev), device_handle(dev), &(call)->generic)
-#define devhandle_call(handle, call) \
- device_call_generic(NULL, (handle), &(call)->generic)
+ device_call_generic((dev), &(call)->generic)
#endif /* _KERNEL */
