diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/core/control.c | 2 | ||||
-rw-r--r-- | sound/core/hwdep.c | 2 | ||||
-rw-r--r-- | sound/core/info.c | 2 | ||||
-rw-r--r-- | sound/core/init.c | 4 | ||||
-rw-r--r-- | sound/core/oss/mixer_oss.c | 2 | ||||
-rw-r--r-- | sound/core/oss/pcm_oss.c | 2 | ||||
-rw-r--r-- | sound/core/pcm_native.c | 2 | ||||
-rw-r--r-- | sound/core/rawmidi.c | 2 | ||||
-rw-r--r-- | sound/core/seq/oss/seq_oss.c | 2 | ||||
-rw-r--r-- | sound/core/seq/seq_clientmgr.c | 2 | ||||
-rw-r--r-- | sound/core/sound.c | 2 | ||||
-rw-r--r-- | sound/core/timer.c | 2 | ||||
-rw-r--r-- | sound/oss/ad1889.c | 4 | ||||
-rw-r--r-- | sound/oss/btaudio.c | 6 | ||||
-rw-r--r-- | sound/oss/dmasound/dmasound_core.c | 6 | ||||
-rw-r--r-- | sound/oss/emu10k1/audio.c | 2 | ||||
-rw-r--r-- | sound/oss/emu10k1/midi.c | 2 | ||||
-rw-r--r-- | sound/oss/emu10k1/mixer.c | 2 | ||||
-rw-r--r-- | sound/oss/hal2.c | 4 | ||||
-rw-r--r-- | sound/oss/msnd_pinnacle.c | 2 | ||||
-rw-r--r-- | sound/oss/os.h | 2 | ||||
-rw-r--r-- | sound/oss/sh_dac_audio.c | 2 | ||||
-rw-r--r-- | sound/oss/soundcard.c | 2 | ||||
-rw-r--r-- | sound/oss/via82cxxx_audio.c | 4 | ||||
-rw-r--r-- | sound/oss/vwsnd.c | 4 | ||||
-rw-r--r-- | sound/sound_core.c | 2 |
26 files changed, 35 insertions, 35 deletions
diff --git a/sound/core/control.c b/sound/core/control.c index 42bcf2794b2..86de7258b76 100644 --- a/sound/core/control.c +++ b/sound/core/control.c @@ -1398,7 +1398,7 @@ static int snd_ctl_fasync(int fd, struct file * file, int on) * INIT PART */ -static struct file_operations snd_ctl_f_ops = +static const struct file_operations snd_ctl_f_ops = { .owner = THIS_MODULE, .read = snd_ctl_read, diff --git a/sound/core/hwdep.c b/sound/core/hwdep.c index 39c03f3dfbf..96ffdf18c3f 100644 --- a/sound/core/hwdep.c +++ b/sound/core/hwdep.c @@ -317,7 +317,7 @@ static int snd_hwdep_control_ioctl(struct snd_card *card, */ -static struct file_operations snd_hwdep_f_ops = +static const struct file_operations snd_hwdep_f_ops = { .owner = THIS_MODULE, .llseek = snd_hwdep_llseek, diff --git a/sound/core/info.c b/sound/core/info.c index 54591e2eb6e..bf6dbf99528 100644 --- a/sound/core/info.c +++ b/sound/core/info.c @@ -507,7 +507,7 @@ static int snd_info_entry_mmap(struct file *file, struct vm_area_struct *vma) return -ENXIO; } -static struct file_operations snd_info_entry_operations = +static const struct file_operations snd_info_entry_operations = { .owner = THIS_MODULE, .llseek = snd_info_entry_llseek, diff --git a/sound/core/init.c b/sound/core/init.c index db610373374..4a431e3ea3a 100644 --- a/sound/core/init.c +++ b/sound/core/init.c @@ -36,7 +36,7 @@ static DEFINE_SPINLOCK(shutdown_lock); static LIST_HEAD(shutdown_files); -static struct file_operations snd_shutdown_f_ops; +static const struct file_operations snd_shutdown_f_ops; static unsigned int snd_cards_lock; /* locked for registering/using */ struct snd_card *snd_cards[SNDRV_CARDS]; @@ -244,7 +244,7 @@ static int snd_disconnect_fasync(int fd, struct file *file, int on) return -ENODEV; } -static struct file_operations snd_shutdown_f_ops = +static const struct file_operations snd_shutdown_f_ops = { .owner = THIS_MODULE, .llseek = snd_disconnect_llseek, diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c index 3391f2a9b4d..74a2923eb40 100644 --- a/sound/core/oss/mixer_oss.c +++ b/sound/core/oss/mixer_oss.c @@ -390,7 +390,7 @@ int snd_mixer_oss_ioctl_card(struct snd_card *card, unsigned int cmd, unsigned l * REGISTRATION PART */ -static struct file_operations snd_mixer_oss_f_ops = +static const struct file_operations snd_mixer_oss_f_ops = { .owner = THIS_MODULE, .open = snd_mixer_oss_open, diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c index 786a82e6889..c4744bb07f4 100644 --- a/sound/core/oss/pcm_oss.c +++ b/sound/core/oss/pcm_oss.c @@ -2889,7 +2889,7 @@ static void snd_pcm_oss_proc_done(struct snd_pcm *pcm) * ENTRY functions */ -static struct file_operations snd_pcm_oss_f_reg = +static const struct file_operations snd_pcm_oss_f_reg = { .owner = THIS_MODULE, .read = snd_pcm_oss_read, diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c index b52e89393fa..3e276fcf333 100644 --- a/sound/core/pcm_native.c +++ b/sound/core/pcm_native.c @@ -3424,7 +3424,7 @@ out: * Register section */ -struct file_operations snd_pcm_f_ops[2] = { +const struct file_operations snd_pcm_f_ops[2] = { { .owner = THIS_MODULE, .write = snd_pcm_write, diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c index 7e6ceec738d..d14dcbb6dbc 100644 --- a/sound/core/rawmidi.c +++ b/sound/core/rawmidi.c @@ -1359,7 +1359,7 @@ static void snd_rawmidi_proc_info_read(struct snd_info_entry *entry, * Register functions */ -static struct file_operations snd_rawmidi_f_ops = +static const struct file_operations snd_rawmidi_f_ops = { .owner = THIS_MODULE, .read = snd_rawmidi_read, diff --git a/sound/core/seq/oss/seq_oss.c b/sound/core/seq/oss/seq_oss.c index 92858cf8b6e..2eb987308b5 100644 --- a/sound/core/seq/oss/seq_oss.c +++ b/sound/core/seq/oss/seq_oss.c @@ -208,7 +208,7 @@ odev_poll(struct file *file, poll_table * wait) * registration of sequencer minor device */ -static struct file_operations seq_oss_f_ops = +static const struct file_operations seq_oss_f_ops = { .owner = THIS_MODULE, .read = odev_read, diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c index bb9dd9fa8e5..694efe832b6 100644 --- a/sound/core/seq/seq_clientmgr.c +++ b/sound/core/seq/seq_clientmgr.c @@ -2538,7 +2538,7 @@ void snd_seq_info_clients_read(struct snd_info_entry *entry, * REGISTRATION PART */ -static struct file_operations snd_seq_f_ops = +static const struct file_operations snd_seq_f_ops = { .owner = THIS_MODULE, .read = snd_seq_read, diff --git a/sound/core/sound.c b/sound/core/sound.c index 4084de06412..70600df94d6 100644 --- a/sound/core/sound.c +++ b/sound/core/sound.c @@ -168,7 +168,7 @@ static int snd_open(struct inode *inode, struct file *file) return err; } -static struct file_operations snd_fops = +static const struct file_operations snd_fops = { .owner = THIS_MODULE, .open = snd_open diff --git a/sound/core/timer.c b/sound/core/timer.c index 3e063835106..160e40ede72 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -1901,7 +1901,7 @@ static unsigned int snd_timer_user_poll(struct file *file, poll_table * wait) #define snd_timer_user_ioctl_compat NULL #endif -static struct file_operations snd_timer_f_ops = +static const struct file_operations snd_timer_f_ops = { .owner = THIS_MODULE, .read = snd_timer_user_read, diff --git a/sound/oss/ad1889.c b/sound/oss/ad1889.c index 09263d72a51..f0724327493 100644 --- a/sound/oss/ad1889.c +++ b/sound/oss/ad1889.c @@ -778,7 +778,7 @@ static int ad1889_release(struct inode *inode, struct file *file) return 0; } -static struct file_operations ad1889_fops = { +static const struct file_operations ad1889_fops = { .owner = THIS_MODULE, .llseek = no_llseek, .read = ad1889_read, @@ -812,7 +812,7 @@ static int ad1889_mixer_ioctl(struct inode *inode, struct file *file, return codec->mixer_ioctl(codec, cmd, arg); } -static struct file_operations ad1889_mixer_fops = { +static const struct file_operations ad1889_mixer_fops = { .owner = THIS_MODULE, .llseek = no_llseek, .ioctl = ad1889_mixer_ioctl, diff --git a/sound/oss/btaudio.c b/sound/oss/btaudio.c index ad7210a00dc..f845528e1fa 100644 --- a/sound/oss/btaudio.c +++ b/sound/oss/btaudio.c @@ -429,7 +429,7 @@ static int btaudio_mixer_ioctl(struct inode *inode, struct file *file, return 0; } -static struct file_operations btaudio_mixer_fops = { +static const struct file_operations btaudio_mixer_fops = { .owner = THIS_MODULE, .llseek = no_llseek, .open = btaudio_mixer_open, @@ -796,7 +796,7 @@ static unsigned int btaudio_dsp_poll(struct file *file, struct poll_table_struct return mask; } -static struct file_operations btaudio_digital_dsp_fops = { +static const struct file_operations btaudio_digital_dsp_fops = { .owner = THIS_MODULE, .llseek = no_llseek, .open = btaudio_dsp_open_digital, @@ -807,7 +807,7 @@ static struct file_operations btaudio_digital_dsp_fops = { .poll = btaudio_dsp_poll, }; -static struct file_operations btaudio_analog_dsp_fops = { +static const struct file_operations btaudio_analog_dsp_fops = { .owner = THIS_MODULE, .llseek = no_llseek, .open = btaudio_dsp_open_analog, diff --git a/sound/oss/dmasound/dmasound_core.c b/sound/oss/dmasound/dmasound_core.c index 80b836e80d9..a0ec886f2aa 100644 --- a/sound/oss/dmasound/dmasound_core.c +++ b/sound/oss/dmasound/dmasound_core.c @@ -371,7 +371,7 @@ static int mixer_ioctl(struct inode *inode, struct file *file, u_int cmd, return -EINVAL; } -static struct file_operations mixer_fops = +static const struct file_operations mixer_fops = { .owner = THIS_MODULE, .llseek = no_llseek, @@ -1337,7 +1337,7 @@ static int sq_ioctl(struct inode *inode, struct file *file, u_int cmd, return -EINVAL; } -static struct file_operations sq_fops = +static const struct file_operations sq_fops = { .owner = THIS_MODULE, .llseek = no_llseek, @@ -1561,7 +1561,7 @@ static ssize_t state_read(struct file *file, char __user *buf, size_t count, return n; } -static struct file_operations state_fops = { +static const struct file_operations state_fops = { .owner = THIS_MODULE, .llseek = no_llseek, .read = state_read, diff --git a/sound/oss/emu10k1/audio.c b/sound/oss/emu10k1/audio.c index efcf589d708..e75ea21eb81 100644 --- a/sound/oss/emu10k1/audio.c +++ b/sound/oss/emu10k1/audio.c @@ -1582,7 +1582,7 @@ static void emu10k1_waveout_bh(unsigned long refdata) return; } -struct file_operations emu10k1_audio_fops = { +const struct file_operations emu10k1_audio_fops = { .owner = THIS_MODULE, .llseek = no_llseek, .read = emu10k1_audio_read, diff --git a/sound/oss/emu10k1/midi.c b/sound/oss/emu10k1/midi.c index cca3dad2bdf..df1e990449a 100644 --- a/sound/oss/emu10k1/midi.c +++ b/sound/oss/emu10k1/midi.c @@ -458,7 +458,7 @@ int emu10k1_midi_callback(unsigned long msg, unsigned long refdata, unsigned lon } /* MIDI file operations */ -struct file_operations emu10k1_midi_fops = { +const struct file_operations emu10k1_midi_fops = { .owner = THIS_MODULE, .read = emu10k1_midi_read, .write = emu10k1_midi_write, diff --git a/sound/oss/emu10k1/mixer.c b/sound/oss/emu10k1/mixer.c index 6419796c2ed..bc3805fb070 100644 --- a/sound/oss/emu10k1/mixer.c +++ b/sound/oss/emu10k1/mixer.c @@ -681,7 +681,7 @@ static int emu10k1_mixer_release(struct inode *inode, struct file *file) return 0; } -struct file_operations emu10k1_mixer_fops = { +const struct file_operations emu10k1_mixer_fops = { .owner = THIS_MODULE, .llseek = no_llseek, .ioctl = emu10k1_mixer_ioctl, diff --git a/sound/oss/hal2.c b/sound/oss/hal2.c index d18286ccc14..80a42773c64 100644 --- a/sound/oss/hal2.c +++ b/sound/oss/hal2.c @@ -1377,7 +1377,7 @@ static int hal2_release(struct inode *inode, struct file *file) return 0; } -static struct file_operations hal2_audio_fops = { +static const struct file_operations hal2_audio_fops = { .owner = THIS_MODULE, .llseek = no_llseek, .read = hal2_read, @@ -1388,7 +1388,7 @@ static struct file_operations hal2_audio_fops = { .release = hal2_release, }; -static struct file_operations hal2_mixer_fops = { +static const struct file_operations hal2_mixer_fops = { .owner = THIS_MODULE, .llseek = no_llseek, .ioctl = hal2_ioctl_mixdev, diff --git a/sound/oss/msnd_pinnacle.c b/sound/oss/msnd_pinnacle.c index 24110d63b13..f1f49ebf752 100644 --- a/sound/oss/msnd_pinnacle.c +++ b/sound/oss/msnd_pinnacle.c @@ -1106,7 +1106,7 @@ static irqreturn_t intr(int irq, void *dev_id) return IRQ_HANDLED; } -static struct file_operations dev_fileops = { +static const struct file_operations dev_fileops = { .owner = THIS_MODULE, .read = dev_read, .write = dev_write, diff --git a/sound/oss/os.h b/sound/oss/os.h index 0490562c7f7..a1a962d7f67 100644 --- a/sound/oss/os.h +++ b/sound/oss/os.h @@ -43,4 +43,4 @@ extern int sound_nblocks; #undef PSEUDO_DMA_AUTOINIT #define ALLOW_BUFFER_MAPPING -extern struct file_operations oss_sound_fops; +extern const struct file_operations oss_sound_fops; diff --git a/sound/oss/sh_dac_audio.c b/sound/oss/sh_dac_audio.c index 51f554154c4..7ea9accc2ba 100644 --- a/sound/oss/sh_dac_audio.c +++ b/sound/oss/sh_dac_audio.c @@ -255,7 +255,7 @@ static int dac_audio_release(struct inode *inode, struct file *file) return 0; } -struct file_operations dac_audio_fops = { +const struct file_operations dac_audio_fops = { .read = dac_audio_read, .write = dac_audio_write, .ioctl = dac_audio_ioctl, diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c index b92c8cd1aea..dcd8d6d2f56 100644 --- a/sound/oss/soundcard.c +++ b/sound/oss/soundcard.c @@ -483,7 +483,7 @@ static int sound_mmap(struct file *file, struct vm_area_struct *vma) return 0; } -struct file_operations oss_sound_fops = { +const struct file_operations oss_sound_fops = { .owner = THIS_MODULE, .llseek = no_llseek, .read = sound_read, diff --git a/sound/oss/via82cxxx_audio.c b/sound/oss/via82cxxx_audio.c index c96cc8c68b3..7ab3a732e18 100644 --- a/sound/oss/via82cxxx_audio.c +++ b/sound/oss/via82cxxx_audio.c @@ -1619,7 +1619,7 @@ out: } -static struct file_operations via_mixer_fops = { +static const struct file_operations via_mixer_fops = { .owner = THIS_MODULE, .open = via_mixer_open, .llseek = no_llseek, @@ -2042,7 +2042,7 @@ static int via_interrupt_init (struct via_info *card) * */ -static struct file_operations via_dsp_fops = { +static const struct file_operations via_dsp_fops = { .owner = THIS_MODULE, .open = via_dsp_open, .release = via_dsp_release, diff --git a/sound/oss/vwsnd.c b/sound/oss/vwsnd.c index 6dfb9f4b03e..d25249a932b 100644 --- a/sound/oss/vwsnd.c +++ b/sound/oss/vwsnd.c @@ -3035,7 +3035,7 @@ static int vwsnd_audio_release(struct inode *inode, struct file *file) return err; } -static struct file_operations vwsnd_audio_fops = { +static const struct file_operations vwsnd_audio_fops = { .owner = THIS_MODULE, .llseek = no_llseek, .read = vwsnd_audio_read, @@ -3225,7 +3225,7 @@ static int vwsnd_mixer_ioctl(struct inode *ioctl, return retval; } -static struct file_operations vwsnd_mixer_fops = { +static const struct file_operations vwsnd_mixer_fops = { .owner = THIS_MODULE, .llseek = no_llseek, .ioctl = vwsnd_mixer_ioctl, diff --git a/sound/sound_core.c b/sound/sound_core.c index 8f1ced4ab34..46daca17550 100644 --- a/sound/sound_core.c +++ b/sound/sound_core.c @@ -436,7 +436,7 @@ EXPORT_SYMBOL(unregister_sound_dsp); static int soundcore_open(struct inode *, struct file *); -static struct file_operations soundcore_fops= +static const struct file_operations soundcore_fops= { /* We must have an owner or the module locking fails */ .owner = THIS_MODULE, |