Index: sys/arm/broadcom/bcm2835/bcm2835_audio.c
===================================================================
--- sys/arm/broadcom/bcm2835/bcm2835_audio.c
+++ sys/arm/broadcom/bcm2835/bcm2835_audio.c
@@ -38,7 +38,7 @@
 
 #include "vc_vchi_audioserv_defs.h"
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 /* Audio destination */
 #define	DEST_AUTO		0
Index: sys/dev/sound/pci/als4000.c
===================================================================
--- sys/dev/sound/pci/als4000.c
+++ sys/dev/sound/pci/als4000.c
@@ -48,7 +48,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 /* Debugging macro's */
 #undef DEB
Index: sys/dev/sound/pci/atiixp.c
===================================================================
--- sys/dev/sound/pci/atiixp.c
+++ sys/dev/sound/pci/atiixp.c
@@ -69,7 +69,7 @@
 
 #include <dev/sound/pci/atiixp.h>
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 #define ATI_IXP_DMA_RETRY_MAX	100
 
Index: sys/dev/sound/pci/cmi.c
===================================================================
--- sys/dev/sound/pci/cmi.c
+++ sys/dev/sound/pci/cmi.c
@@ -61,7 +61,7 @@
 #include "mixer_if.h"
 #include "mpufoi_if.h"
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 /* Supported chip ID's */
 #define CMI8338A_PCI_ID   0x010013f6
Index: sys/dev/sound/pci/cs4281.c
===================================================================
--- sys/dev/sound/pci/cs4281.c
+++ sys/dev/sound/pci/cs4281.c
@@ -45,7 +45,7 @@
 
 #include <dev/sound/pci/cs4281.h>
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 #define CS4281_DEFAULT_BUFSZ 16384
 
Index: sys/dev/sound/pci/csa.c
===================================================================
--- sys/dev/sound/pci/csa.c
+++ sys/dev/sound/pci/csa.c
@@ -54,7 +54,7 @@
 
 #include <dev/sound/pci/cs461x_dsp.h>
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 /* This is the pci device id. */
 #define CS4610_PCI_ID 0x60011013
Index: sys/dev/sound/pci/csamidi.c
===================================================================
--- sys/dev/sound/pci/csamidi.c
+++ sys/dev/sound/pci/csamidi.c
@@ -54,7 +54,7 @@
 
 #include "mpufoi_if.h"
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 /* pulled from mpu401.c */
 #define	MPU_DATAPORT	0
Index: sys/dev/sound/pci/csapcm.c
===================================================================
--- sys/dev/sound/pci/csapcm.c
+++ sys/dev/sound/pci/csapcm.c
@@ -43,7 +43,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 /* Buffer size on dma transfer. Fixed for CS416x. */
 #define CS461x_BUFFSIZE   (4 * 1024)
Index: sys/dev/sound/pci/emu10k1.c
===================================================================
--- sys/dev/sound/pci/emu10k1.c
+++ sys/dev/sound/pci/emu10k1.c
@@ -43,7 +43,7 @@
 #include <dev/sound/midi/mpu401.h>
 #include "mpufoi_if.h"
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 /* -------------------------------------------------------------------- */
 
Index: sys/dev/sound/pci/envy24.c
===================================================================
--- sys/dev/sound/pci/envy24.c
+++ sys/dev/sound/pci/envy24.c
@@ -41,7 +41,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 static MALLOC_DEFINE(M_ENVY24, "envy24", "envy24 audio");
 
Index: sys/dev/sound/pci/envy24ht.c
===================================================================
--- sys/dev/sound/pci/envy24ht.c
+++ sys/dev/sound/pci/envy24ht.c
@@ -53,7 +53,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 static MALLOC_DEFINE(M_ENVY24HT, "envy24ht", "envy24ht audio");
 
Index: sys/dev/sound/pci/es137x.c
===================================================================
--- sys/dev/sound/pci/es137x.c
+++ sys/dev/sound/pci/es137x.c
@@ -90,7 +90,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 #define MEM_MAP_REG 0x14
 
Index: sys/dev/sound/pci/fm801.c
===================================================================
--- sys/dev/sound/pci/fm801.c
+++ sys/dev/sound/pci/fm801.c
@@ -35,7 +35,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 #define PCI_VENDOR_FORTEMEDIA	0x1319
 #define PCI_DEVICE_FORTEMEDIA1	0x08011319	/* Audio controller */
Index: sys/dev/sound/pci/hda/hdaa.c
===================================================================
--- sys/dev/sound/pci/hda/hdaa.c
+++ sys/dev/sound/pci/hda/hdaa.c
@@ -47,7 +47,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 #define hdaa_lock(devinfo)	snd_mtxlock((devinfo)->lock)
 #define hdaa_unlock(devinfo)	snd_mtxunlock((devinfo)->lock)
Index: sys/dev/sound/pci/hda/hdaa_patches.c
===================================================================
--- sys/dev/sound/pci/hda/hdaa_patches.c
+++ sys/dev/sound/pci/hda/hdaa_patches.c
@@ -47,7 +47,7 @@
 #include "pin_patch.h"
 #include "pin_patch_realtek.h"
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 static const struct {
 	uint32_t model;
Index: sys/dev/sound/pci/hda/hdac.c
===================================================================
--- sys/dev/sound/pci/hda/hdac.c
+++ sys/dev/sound/pci/hda/hdac.c
@@ -51,7 +51,7 @@
 
 #define HDA_DRV_TEST_REV	"20120126_0002"
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 #define hdac_lock(sc)		snd_mtxlock((sc)->lock)
 #define hdac_unlock(sc)		snd_mtxunlock((sc)->lock)
Index: sys/dev/sound/pci/hda/hdacc.c
===================================================================
--- sys/dev/sound/pci/hda/hdacc.c
+++ sys/dev/sound/pci/hda/hdacc.c
@@ -43,7 +43,7 @@
 #include <dev/sound/pci/hda/hda_reg.h>
 #include <dev/sound/pci/hda/hdac.h>
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 struct hdacc_fg {
 	device_t	dev;
Index: sys/dev/sound/pci/hdspe-pcm.c
===================================================================
--- sys/dev/sound/pci/hdspe-pcm.c
+++ sys/dev/sound/pci/hdspe-pcm.c
@@ -40,7 +40,7 @@
 
 #include <mixer_if.h>
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 struct hdspe_latency {
 	uint32_t n;
Index: sys/dev/sound/pci/hdspe.c
===================================================================
--- sys/dev/sound/pci/hdspe.c
+++ sys/dev/sound/pci/hdspe.c
@@ -40,7 +40,7 @@
 
 #include <mixer_if.h>
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 static struct hdspe_channel chan_map_aio[] = {
 	{  0,  1,   "line", 1, 1 },
Index: sys/dev/sound/pci/ich.c
===================================================================
--- sys/dev/sound/pci/ich.c
+++ sys/dev/sound/pci/ich.c
@@ -38,7 +38,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 /* -------------------------------------------------------------------- */
 
Index: sys/dev/sound/pci/maestro3.c
===================================================================
--- sys/dev/sound/pci/maestro3.c
+++ sys/dev/sound/pci/maestro3.c
@@ -69,7 +69,7 @@
 #include <dev/sound/pci/allegro_reg.h>
 #include <dev/sound/pci/allegro_code.h>
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 /* -------------------------------------------------------------------- */
 
Index: sys/dev/sound/pci/neomagic.c
===================================================================
--- sys/dev/sound/pci/neomagic.c
+++ sys/dev/sound/pci/neomagic.c
@@ -40,7 +40,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 /* -------------------------------------------------------------------- */
 
Index: sys/dev/sound/pci/solo.c
===================================================================
--- sys/dev/sound/pci/solo.c
+++ sys/dev/sound/pci/solo.c
@@ -39,7 +39,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 #define SOLO_DEFAULT_BUFSZ 16384
 #define ABS(x) (((x) < 0)? -(x) : (x))
Index: sys/dev/sound/pci/t4dwave.c
===================================================================
--- sys/dev/sound/pci/t4dwave.c
+++ sys/dev/sound/pci/t4dwave.c
@@ -37,7 +37,7 @@
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 /* -------------------------------------------------------------------- */
 
Index: sys/dev/sound/pci/via8233.c
===================================================================
--- sys/dev/sound/pci/via8233.c
+++ sys/dev/sound/pci/via8233.c
@@ -50,7 +50,7 @@
 
 #include <dev/sound/pci/via8233.h>
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 #define VIA8233_PCI_ID 0x30591106
 
Index: sys/dev/sound/pci/via82c686.c
===================================================================
--- sys/dev/sound/pci/via82c686.c
+++ sys/dev/sound/pci/via82c686.c
@@ -39,7 +39,7 @@
 
 #include <dev/sound/pci/via82c686.h>
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 #define VIA_PCI_ID 0x30581106
 #define	NSEGS		4	/* Number of segments in SGD table */
Index: sys/dev/sound/pci/vibes.c
===================================================================
--- sys/dev/sound/pci/vibes.c
+++ sys/dev/sound/pci/vibes.c
@@ -44,7 +44,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 /* ------------------------------------------------------------------------- */
 /* Constants */
Index: sys/dev/sound/pcm/ac97.c
===================================================================
--- sys/dev/sound/pcm/ac97.c
+++ sys/dev/sound/pcm/ac97.c
@@ -38,7 +38,7 @@
 
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 static MALLOC_DEFINE(M_AC97, "ac97", "ac97 codec");
 
Index: sys/dev/sound/pcm/ac97_patch.c
===================================================================
--- sys/dev/sound/pcm/ac97_patch.c
+++ sys/dev/sound/pcm/ac97_patch.c
@@ -34,7 +34,7 @@
 #include <dev/sound/pcm/ac97.h>
 #include <dev/sound/pcm/ac97_patch.h>
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 void ad1886_patch(struct ac97_info* codec)
 {
Index: sys/dev/sound/pcm/buffer.c
===================================================================
--- sys/dev/sound/pcm/buffer.c
+++ sys/dev/sound/pcm/buffer.c
@@ -40,7 +40,7 @@
 #define	SND_DECLARE_FXDIV
 #include "snd_fxdiv_gen.h"
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 struct snd_dbuf *
 sndbuf_create(device_t dev, char *drv, char *desc, struct pcm_channel *channel)
Index: sys/dev/sound/pcm/channel.c
===================================================================
--- sys/dev/sound/pcm/channel.c
+++ sys/dev/sound/pcm/channel.c
@@ -38,7 +38,7 @@
 
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 int report_soft_formats = 1;
 SYSCTL_INT(_hw_snd, OID_AUTO, report_soft_formats, CTLFLAG_RW,
Index: sys/dev/sound/pcm/dsp.c
===================================================================
--- sys/dev/sound/pcm/dsp.c
+++ sys/dev/sound/pcm/dsp.c
@@ -43,7 +43,7 @@
 #include <vm/vm_page.h>
 #include <vm/vm_pager.h>
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 static int dsp_mmap_allow_prot_exec = 0;
 SYSCTL_INT(_hw_snd, OID_AUTO, compat_linux_mmap, CTLFLAG_RWTUN,
Index: sys/dev/sound/pcm/feeder.c
===================================================================
--- sys/dev/sound/pcm/feeder.c
+++ sys/dev/sound/pcm/feeder.c
@@ -35,7 +35,7 @@
 
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 static MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder");
 
Index: sys/dev/sound/pcm/feeder_chain.c
===================================================================
--- sys/dev/sound/pcm/feeder_chain.c
+++ sys/dev/sound/pcm/feeder_chain.c
@@ -34,7 +34,7 @@
 
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 /* chain state */
 struct feeder_chain_state {
Index: sys/dev/sound/pcm/feeder_eq.c
===================================================================
--- sys/dev/sound/pcm/feeder_eq.c
+++ sys/dev/sound/pcm/feeder_eq.c
@@ -46,7 +46,7 @@
 #define SND_USE_FXDIV
 #include "snd_fxdiv_gen.h"
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 #endif
 
 #include "feeder_eq_gen.h"
Index: sys/dev/sound/pcm/feeder_format.c
===================================================================
--- sys/dev/sound/pcm/feeder_format.c
+++ sys/dev/sound/pcm/feeder_format.c
@@ -44,7 +44,7 @@
 #define SND_USE_FXDIV
 #include "snd_fxdiv_gen.h"
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 #endif
 
 #define FEEDFORMAT_RESERVOIR	(SND_CHN_MAX * PCM_32_BPS)
Index: sys/dev/sound/pcm/feeder_matrix.c
===================================================================
--- sys/dev/sound/pcm/feeder_matrix.c
+++ sys/dev/sound/pcm/feeder_matrix.c
@@ -54,7 +54,7 @@
 #define SND_USE_FXDIV
 #include "snd_fxdiv_gen.h"
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 #endif
 
 #define FEEDMATRIX_RESERVOIR	(SND_CHN_MAX * PCM_32_BPS)
Index: sys/dev/sound/pcm/feeder_mixer.c
===================================================================
--- sys/dev/sound/pcm/feeder_mixer.c
+++ sys/dev/sound/pcm/feeder_mixer.c
@@ -38,7 +38,7 @@
 #define SND_USE_FXDIV
 #include "snd_fxdiv_gen.h"
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 #endif
 
 #undef SND_FEEDER_MULTIFORMAT
Index: sys/dev/sound/pcm/feeder_rate.c
===================================================================
--- sys/dev/sound/pcm/feeder_rate.c
+++ sys/dev/sound/pcm/feeder_rate.c
@@ -61,7 +61,7 @@
 #define SND_USE_FXDIV
 #include "snd_fxdiv_gen.h"
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 #endif
 
 #include "feeder_rate_gen.h"
Index: sys/dev/sound/pcm/feeder_volume.c
===================================================================
--- sys/dev/sound/pcm/feeder_volume.c
+++ sys/dev/sound/pcm/feeder_volume.c
@@ -39,7 +39,7 @@
 #define SND_USE_FXDIV
 #include "snd_fxdiv_gen.h"
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 #endif
 
 typedef void (*feed_volume_t)(int *, int *, uint32_t, uint8_t *, uint32_t);
Index: sys/dev/sound/pcm/mixer.c
===================================================================
--- sys/dev/sound/pcm/mixer.c
+++ sys/dev/sound/pcm/mixer.c
@@ -37,7 +37,7 @@
 #include "feeder_if.h"
 #include "mixer_if.h"
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 static MALLOC_DEFINE(M_MIXER, "mixer", "mixer");
 
Index: sys/dev/sound/pcm/sndstat.c
===================================================================
--- sys/dev/sound/pcm/sndstat.c
+++ sys/dev/sound/pcm/sndstat.c
@@ -50,7 +50,7 @@
 #include <dev/sound/version.h>
 
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 #define	SS_TYPE_MODULE		0
 #define	SS_TYPE_PCM		1
Index: sys/dev/sound/pcm/sound.h
===================================================================
--- sys/dev/sound/pcm/sound.h
+++ sys/dev/sound/pcm/sound.h
@@ -351,16 +351,12 @@
 int sndstat_unregister(device_t dev);
 int sndstat_unregisterfile(char *str);
 
-#define SND_DECLARE_FILE(version) \
-	_SND_DECLARE_FILE(__LINE__, version)
+#define SND_DECLARE_FILE() \
+	_SND_DECLARE_FILE(__LINE__)
 
-#define _SND_DECLARE_FILE(uniq, version) \
-	__SND_DECLARE_FILE(uniq, version)
-
-#define __SND_DECLARE_FILE(uniq, version) \
-	static char sndstat_vinfo[] = version; \
-	SYSINIT(sdf_ ## uniq, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, sndstat_registerfile, sndstat_vinfo); \
-	SYSUNINIT(sdf_ ## uniq, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, sndstat_unregisterfile, sndstat_vinfo);
+#define _SND_DECLARE_FILE(uniq) \
+	SYSINIT(sdf_ ## uniq, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, sndstat_registerfile, NULL); \
+	SYSUNINIT(sdf_ ## uniq, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, sndstat_unregisterfile, NULL);
 
 /* usage of flags in device config entry (config file) */
 #define DV_F_DRQ_MASK	0x00000007	/* mask for secondary drq */
Index: sys/dev/sound/pcm/sound.c
===================================================================
--- sys/dev/sound/pcm/sound.c
+++ sys/dev/sound/pcm/sound.c
@@ -44,7 +44,7 @@
 
 #include "feeder_if.h"
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 devclass_t pcm_devclass;
 
Index: sys/dev/sound/pcm/vchan.c
===================================================================
--- sys/dev/sound/pcm/vchan.c
+++ sys/dev/sound/pcm/vchan.c
@@ -36,7 +36,7 @@
 #include <dev/sound/pcm/sound.h>
 #include <dev/sound/pcm/vchan.h>
 
-SND_DECLARE_FILE("");
+SND_DECLARE_FILE();
 
 /*
  * [ac3 , dts , linear , 0, linear, 0]