D37276.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D37276.diff
View Options

	diff --git a/stand/kshim/bsd_kernel.h b/stand/kshim/bsd_kernel.h
	--- a/stand/kshim/bsd_kernel.h
	+++ b/stand/kshim/bsd_kernel.h
	@@ -89,10 +89,10 @@
	#define DEVMETHOD(what,func) { #what, (void *)&func }
	#define DEVMETHOD_END {0,0}
	#define EARLY_DRIVER_MODULE(a, b, c, d, e, f, g) DRIVER_MODULE(a, b, c, d, e, f)
	-#define DRIVER_MODULE(name, busname, driver, devclass, evh, arg) \
	+#define DRIVER_MODULE(name, busname, driver, evh, arg) \
	static struct module_data bsd_##name##_##busname##_driver_mod = { \
	evh, arg, #busname, #name, #busname "/" #name, \
	- &driver, &devclass, { 0, 0 } }; \
	+ &driver, NULL, { 0, 0 } }; \
	SYSINIT(bsd_##name##_##busname##_driver_mod, SI_SUB_DRIVERS, \
	SI_ORDER_MIDDLE, module_register, \
	&bsd_##name##_##busname##_driver_mod)
	diff --git a/stand/usb/storage/umass_common.c b/stand/usb/storage/umass_common.c
	--- a/stand/usb/storage/umass_common.c
	+++ b/stand/usb/storage/umass_common.c
	@@ -39,8 +39,6 @@
	static device_attach_t umass_attach;
	static device_detach_t umass_detach;

	-static devclass_t umass_devclass;
	-
	static device_method_t umass_methods[] = {
	/* Device interface */
	DEVMETHOD(device_probe, umass_probe),
	@@ -55,7 +53,7 @@
	.methods = umass_methods,
	};

	-DRIVER_MODULE(umass, uhub, umass_driver, umass_devclass, NULL, 0);
	+DRIVER_MODULE(umass, uhub, umass_driver, NULL, 0);

	static int
	umass_probe(device_t dev)