diff --git a/sys/cddl/dev/dtmalloc/dtmalloc.c b/sys/cddl/dev/dtmalloc/dtmalloc.c index 3f584dc0860..ae21054315d 100644 --- a/sys/cddl/dev/dtmalloc/dtmalloc.c +++ b/sys/cddl/dev/dtmalloc/dtmalloc.c @@ -39,7 +39,6 @@ extern bool dtrace_malloc_enabled; static uint32_t dtrace_malloc_enabled_count; -static d_open_t dtmalloc_open; static int dtmalloc_unload(void); static void dtmalloc_getargdesc(void *, dtrace_id_t, void *, dtrace_argdesc_t *); static void dtmalloc_provide(void *, dtrace_probedesc_t *); @@ -48,12 +47,6 @@ static void dtmalloc_enable(void *, dtrace_id_t, void *); static void dtmalloc_disable(void *, dtrace_id_t, void *); static void dtmalloc_load(void *); -static struct cdevsw dtmalloc_cdevsw = { - .d_version = D_VERSION, - .d_open = dtmalloc_open, - .d_name = "dtmalloc", -}; - static dtrace_pattr_t dtmalloc_attr = { { DTRACE_STABILITY_STABLE, DTRACE_STABILITY_STABLE, DTRACE_CLASS_COMMON }, { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN }, @@ -75,7 +68,6 @@ static dtrace_pops_t dtmalloc_pops = { .dtps_destroy = dtmalloc_destroy }; -static struct cdev *dtmalloc_cdev; static dtrace_provider_id_t dtmalloc_id; static void @@ -173,10 +165,6 @@ dtmalloc_disable(void *arg, dtrace_id_t id, void *parg) static void dtmalloc_load(void *dummy) { - /* Create the /dev/dtrace/dtmalloc entry. */ - dtmalloc_cdev = make_dev(&dtmalloc_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, - "dtrace/dtmalloc"); - if (dtrace_register("dtmalloc", &dtmalloc_attr, DTRACE_PRIV_USER, NULL, &dtmalloc_pops, NULL, &dtmalloc_id) != 0) return; @@ -195,8 +183,6 @@ dtmalloc_unload() if ((error = dtrace_unregister(dtmalloc_id)) != 0) return (error); - destroy_dev(dtmalloc_cdev); - return (error); } @@ -224,12 +210,6 @@ dtmalloc_modevent(module_t mod __unused, int type, void *data __unused) return (error); } -static int -dtmalloc_open(struct cdev *dev __unused, int oflags __unused, int devtype __unused, struct thread *td __unused) -{ - return (0); -} - SYSINIT(dtmalloc_load, SI_SUB_DTRACE_PROVIDER, SI_ORDER_ANY, dtmalloc_load, NULL); SYSUNINIT(dtmalloc_unload, SI_SUB_DTRACE_PROVIDER, SI_ORDER_ANY, dtmalloc_unload, NULL); diff --git a/sys/cddl/dev/fbt/fbt.c b/sys/cddl/dev/fbt/fbt.c index aee5376d598..1ee7d121f60 100644 --- a/sys/cddl/dev/fbt/fbt.c +++ b/sys/cddl/dev/fbt/fbt.c @@ -70,7 +70,6 @@ dtrace_provider_id_t fbt_id; fbt_probe_t **fbt_probetab; int fbt_probetab_mask; -static d_open_t fbt_open; static int fbt_unload(void); static void fbt_getargdesc(void *, dtrace_id_t, void *, dtrace_argdesc_t *); static void fbt_provide_module(void *, modctl_t *); @@ -81,12 +80,6 @@ static void fbt_load(void *); static void fbt_suspend(void *, dtrace_id_t, void *); static void fbt_resume(void *, dtrace_id_t, void *); -static struct cdevsw fbt_cdevsw = { - .d_version = D_VERSION, - .d_open = fbt_open, - .d_name = "fbt", -}; - static dtrace_pattr_t fbt_attr = { { DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_COMMON }, { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN }, @@ -108,7 +101,6 @@ static dtrace_pops_t fbt_pops = { .dtps_destroy = fbt_destroy }; -static struct cdev *fbt_cdev; static int fbt_probetab_size; static int fbt_verbose = 0; @@ -1255,10 +1247,6 @@ fbt_linker_file_cb(linker_file_t lf, void *arg) static void fbt_load(void *dummy) { - /* Create the /dev/dtrace/fbt entry. */ - fbt_cdev = make_dev(&fbt_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, - "dtrace/fbt"); - /* Default the probe table size if not specified. */ if (fbt_probetab_size == 0) fbt_probetab_size = FBT_PROBETAB_SIZE; @@ -1300,8 +1288,6 @@ fbt_unload() fbt_probetab = NULL; fbt_probetab_mask = 0; - destroy_dev(fbt_cdev); - return (error); } @@ -1329,12 +1315,6 @@ fbt_modevent(module_t mod __unused, int type, void *data __unused) return (error); } -static int -fbt_open(struct cdev *dev __unused, int oflags __unused, int devtype __unused, struct thread *td __unused) -{ - return (0); -} - SYSINIT(fbt_load, SI_SUB_DTRACE_PROVIDER, SI_ORDER_ANY, fbt_load, NULL); SYSUNINIT(fbt_unload, SI_SUB_DTRACE_PROVIDER, SI_ORDER_ANY, fbt_unload, NULL); diff --git a/sys/cddl/dev/profile/profile.c b/sys/cddl/dev/profile/profile.c index 1e7a84c272c..87289ff2717 100644 --- a/sys/cddl/dev/profile/profile.c +++ b/sys/cddl/dev/profile/profile.c @@ -155,7 +155,6 @@ typedef struct profile_probe_percpu { #endif } profile_probe_percpu_t; -static d_open_t profile_open; static int profile_unload(void); static void profile_create(hrtime_t, char *, int); static void profile_destroy(void *, dtrace_id_t, void *); @@ -189,12 +188,6 @@ static uint32_t profile_max = PROFILE_MAX_DEFAULT; /* maximum number of profile probes */ static uint32_t profile_total; /* current number of profile probes */ -static struct cdevsw profile_cdevsw = { - .d_version = D_VERSION, - .d_open = profile_open, - .d_name = "profile", -}; - static dtrace_pattr_t profile_attr = { { DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_COMMON }, { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN }, @@ -216,7 +209,6 @@ static dtrace_pops_t profile_pops = { .dtps_destroy = profile_destroy }; -static struct cdev *profile_cdev; static dtrace_provider_id_t profile_id; static hrtime_t profile_interval_min = NANOSEC / 5000; /* 5000 hz */ static int profile_aframes = PROF_ARTIFICIAL_FRAMES; @@ -638,10 +630,6 @@ profile_disable(void *arg, dtrace_id_t id, void *parg) static void profile_load(void *dummy) { - /* Create the /dev/dtrace/profile entry. */ - profile_cdev = make_dev(&profile_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, - "dtrace/profile"); - if (dtrace_register("profile", &profile_attr, DTRACE_PRIV_USER, NULL, &profile_pops, NULL, &profile_id) != 0) return; @@ -656,8 +644,6 @@ profile_unload() if ((error = dtrace_unregister(profile_id)) != 0) return (error); - destroy_dev(profile_cdev); - return (error); } @@ -685,13 +671,6 @@ profile_modevent(module_t mod __unused, int type, void *data __unused) return (error); } -/* ARGSUSED */ -static int -profile_open(struct cdev *dev __unused, int oflags __unused, int devtype __unused, struct thread *td __unused) -{ - return (0); -} - SYSINIT(profile_load, SI_SUB_DTRACE_PROVIDER, SI_ORDER_ANY, profile_load, NULL); SYSUNINIT(profile_unload, SI_SUB_DTRACE_PROVIDER, SI_ORDER_ANY, profile_unload, NULL); diff --git a/sys/cddl/dev/prototype.c b/sys/cddl/dev/prototype.c index 6e31f19d5ce..bcbb3d202b2 100644 --- a/sys/cddl/dev/prototype.c +++ b/sys/cddl/dev/prototype.c @@ -82,7 +82,10 @@ prototype_disable(void *arg, dtrace_id_t id, void *parg) static void prototype_load(void *dummy) { - /* Create the /dev/dtrace/prototype entry. */ + /* + * Create the /dev/dtrace/prototype entry. + * XXX: Remove this if the provider does not need any customs ioctls. + */ prototype_cdev = make_dev(&prototype_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "dtrace/prototype");