aboutsummaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@linux.intel.com>2007-02-12 03:55:37 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-12 12:48:46 -0500
commit9c2e08c592cd357a8330c34def1e8ecfdcf53275 (patch)
tree62e7449e43bb502f2e9630ab41832ceccd9a0f65 /sound/core
parentda7071d7e32d15149cc513f096a3638097b66387 (diff)
[PATCH] mark struct file_operations const 9
Many struct file_operations in the kernel can be "const". Marking them const moves these to the .rodata section, which avoids false sharing with potential dirty data. In addition it'll catch accidental writes at compile time to these shared resources. Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/control.c2
-rw-r--r--sound/core/hwdep.c2
-rw-r--r--sound/core/info.c2
-rw-r--r--sound/core/init.c4
-rw-r--r--sound/core/oss/mixer_oss.c2
-rw-r--r--sound/core/oss/pcm_oss.c2
-rw-r--r--sound/core/pcm_native.c2
-rw-r--r--sound/core/rawmidi.c2
-rw-r--r--sound/core/seq/oss/seq_oss.c2
-rw-r--r--sound/core/seq/seq_clientmgr.c2
-rw-r--r--sound/core/sound.c2
-rw-r--r--sound/core/timer.c2
12 files changed, 13 insertions, 13 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)
1398 * INIT PART 1398 * INIT PART
1399 */ 1399 */
1400 1400
1401static struct file_operations snd_ctl_f_ops = 1401static const struct file_operations snd_ctl_f_ops =
1402{ 1402{
1403 .owner = THIS_MODULE, 1403 .owner = THIS_MODULE,
1404 .read = snd_ctl_read, 1404 .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,
317 317
318 */ 318 */
319 319
320static struct file_operations snd_hwdep_f_ops = 320static const struct file_operations snd_hwdep_f_ops =
321{ 321{
322 .owner = THIS_MODULE, 322 .owner = THIS_MODULE,
323 .llseek = snd_hwdep_llseek, 323 .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)
507 return -ENXIO; 507 return -ENXIO;
508} 508}
509 509
510static struct file_operations snd_info_entry_operations = 510static const struct file_operations snd_info_entry_operations =
511{ 511{
512 .owner = THIS_MODULE, 512 .owner = THIS_MODULE,
513 .llseek = snd_info_entry_llseek, 513 .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 @@
36static DEFINE_SPINLOCK(shutdown_lock); 36static DEFINE_SPINLOCK(shutdown_lock);
37static LIST_HEAD(shutdown_files); 37static LIST_HEAD(shutdown_files);
38 38
39static struct file_operations snd_shutdown_f_ops; 39static const struct file_operations snd_shutdown_f_ops;
40 40
41static unsigned int snd_cards_lock; /* locked for registering/using */ 41static unsigned int snd_cards_lock; /* locked for registering/using */
42struct snd_card *snd_cards[SNDRV_CARDS]; 42struct snd_card *snd_cards[SNDRV_CARDS];
@@ -244,7 +244,7 @@ static int snd_disconnect_fasync(int fd, struct file *file, int on)
244 return -ENODEV; 244 return -ENODEV;
245} 245}
246 246
247static struct file_operations snd_shutdown_f_ops = 247static const struct file_operations snd_shutdown_f_ops =
248{ 248{
249 .owner = THIS_MODULE, 249 .owner = THIS_MODULE,
250 .llseek = snd_disconnect_llseek, 250 .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
390 * REGISTRATION PART 390 * REGISTRATION PART
391 */ 391 */
392 392
393static struct file_operations snd_mixer_oss_f_ops = 393static const struct file_operations snd_mixer_oss_f_ops =
394{ 394{
395 .owner = THIS_MODULE, 395 .owner = THIS_MODULE,
396 .open = snd_mixer_oss_open, 396 .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)
2889 * ENTRY functions 2889 * ENTRY functions
2890 */ 2890 */
2891 2891
2892static struct file_operations snd_pcm_oss_f_reg = 2892static const struct file_operations snd_pcm_oss_f_reg =
2893{ 2893{
2894 .owner = THIS_MODULE, 2894 .owner = THIS_MODULE,
2895 .read = snd_pcm_oss_read, 2895 .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:
3424 * Register section 3424 * Register section
3425 */ 3425 */
3426 3426
3427struct file_operations snd_pcm_f_ops[2] = { 3427const struct file_operations snd_pcm_f_ops[2] = {
3428 { 3428 {
3429 .owner = THIS_MODULE, 3429 .owner = THIS_MODULE,
3430 .write = snd_pcm_write, 3430 .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,
1359 * Register functions 1359 * Register functions
1360 */ 1360 */
1361 1361
1362static struct file_operations snd_rawmidi_f_ops = 1362static const struct file_operations snd_rawmidi_f_ops =
1363{ 1363{
1364 .owner = THIS_MODULE, 1364 .owner = THIS_MODULE,
1365 .read = snd_rawmidi_read, 1365 .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)
208 * registration of sequencer minor device 208 * registration of sequencer minor device
209 */ 209 */
210 210
211static struct file_operations seq_oss_f_ops = 211static const struct file_operations seq_oss_f_ops =
212{ 212{
213 .owner = THIS_MODULE, 213 .owner = THIS_MODULE,
214 .read = odev_read, 214 .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,
2538 * REGISTRATION PART 2538 * REGISTRATION PART
2539 */ 2539 */
2540 2540
2541static struct file_operations snd_seq_f_ops = 2541static const struct file_operations snd_seq_f_ops =
2542{ 2542{
2543 .owner = THIS_MODULE, 2543 .owner = THIS_MODULE,
2544 .read = snd_seq_read, 2544 .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)
168 return err; 168 return err;
169} 169}
170 170
171static struct file_operations snd_fops = 171static const struct file_operations snd_fops =
172{ 172{
173 .owner = THIS_MODULE, 173 .owner = THIS_MODULE,
174 .open = snd_open 174 .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)
1901#define snd_timer_user_ioctl_compat NULL 1901#define snd_timer_user_ioctl_compat NULL
1902#endif 1902#endif
1903 1903
1904static struct file_operations snd_timer_f_ops = 1904static const struct file_operations snd_timer_f_ops =
1905{ 1905{
1906 .owner = THIS_MODULE, 1906 .owner = THIS_MODULE,
1907 .read = snd_timer_user_read, 1907 .read = snd_timer_user_read,