aboutsummaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@infradead.org>2006-03-28 04:56:41 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-28 12:16:05 -0500
commit99ac48f54a91d02140c497edc31dc57d4bc5c85d (patch)
tree68719391694a6914191bdf73d2071875f7653f6f /sound/core
parentec1b9466cb4f6ae6d950bd67055d9410d1056d2a (diff)
[PATCH] mark f_ops const in the inode
Mark the f_ops members of inodes as const, as well as fix the ripple-through this causes by places that copy this f_ops and then "do stuff" with it. Signed-off-by: Arjan van de Ven <arjan@infradead.org> Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/init.c3
-rw-r--r--sound/core/sound.c4
-rw-r--r--sound/core/sound_oss.c2
3 files changed, 5 insertions, 4 deletions
diff --git a/sound/core/init.c b/sound/core/init.c
index ad68761abba1..5bb8a8b23d51 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -223,7 +223,8 @@ int snd_card_disconnect(struct snd_card *card)
223 struct snd_monitor_file *mfile; 223 struct snd_monitor_file *mfile;
224 struct file *file; 224 struct file *file;
225 struct snd_shutdown_f_ops *s_f_ops; 225 struct snd_shutdown_f_ops *s_f_ops;
226 struct file_operations *f_ops, *old_f_ops; 226 struct file_operations *f_ops;
227 const struct file_operations *old_f_ops;
227 int err; 228 int err;
228 229
229 spin_lock(&card->files_lock); 230 spin_lock(&card->files_lock);
diff --git a/sound/core/sound.c b/sound/core/sound.c
index 4d28e5212611..108e430b5036 100644
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -137,7 +137,7 @@ static int snd_open(struct inode *inode, struct file *file)
137{ 137{
138 unsigned int minor = iminor(inode); 138 unsigned int minor = iminor(inode);
139 struct snd_minor *mptr = NULL; 139 struct snd_minor *mptr = NULL;
140 struct file_operations *old_fops; 140 const struct file_operations *old_fops;
141 int err = 0; 141 int err = 0;
142 142
143 if (minor >= ARRAY_SIZE(snd_minors)) 143 if (minor >= ARRAY_SIZE(snd_minors))
@@ -240,7 +240,7 @@ static int snd_kernel_minor(int type, struct snd_card *card, int dev)
240 * Retrurns zero if successful, or a negative error code on failure. 240 * Retrurns zero if successful, or a negative error code on failure.
241 */ 241 */
242int snd_register_device(int type, struct snd_card *card, int dev, 242int snd_register_device(int type, struct snd_card *card, int dev,
243 struct file_operations *f_ops, void *private_data, 243 const struct file_operations *f_ops, void *private_data,
244 const char *name) 244 const char *name)
245{ 245{
246 int minor; 246 int minor;
diff --git a/sound/core/sound_oss.c b/sound/core/sound_oss.c
index 4023d3b406de..9055c6de9587 100644
--- a/sound/core/sound_oss.c
+++ b/sound/core/sound_oss.c
@@ -95,7 +95,7 @@ static int snd_oss_kernel_minor(int type, struct snd_card *card, int dev)
95} 95}
96 96
97int snd_register_oss_device(int type, struct snd_card *card, int dev, 97int snd_register_oss_device(int type, struct snd_card *card, int dev,
98 struct file_operations *f_ops, void *private_data, 98 const struct file_operations *f_ops, void *private_data,
99 const char *name) 99 const char *name)
100{ 100{
101 int minor = snd_oss_kernel_minor(type, card, dev); 101 int minor = snd_oss_kernel_minor(type, card, dev);