[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>
This commit is contained in:
committed by
Linus Torvalds
parent
ec1b9466cb
commit
99ac48f54a
@@ -223,7 +223,8 @@ int snd_card_disconnect(struct snd_card *card)
|
||||
struct snd_monitor_file *mfile;
|
||||
struct file *file;
|
||||
struct snd_shutdown_f_ops *s_f_ops;
|
||||
struct file_operations *f_ops, *old_f_ops;
|
||||
struct file_operations *f_ops;
|
||||
const struct file_operations *old_f_ops;
|
||||
int err;
|
||||
|
||||
spin_lock(&card->files_lock);
|
||||
|
@@ -137,7 +137,7 @@ static int snd_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
unsigned int minor = iminor(inode);
|
||||
struct snd_minor *mptr = NULL;
|
||||
struct file_operations *old_fops;
|
||||
const struct file_operations *old_fops;
|
||||
int err = 0;
|
||||
|
||||
if (minor >= ARRAY_SIZE(snd_minors))
|
||||
@@ -240,7 +240,7 @@ static int snd_kernel_minor(int type, struct snd_card *card, int dev)
|
||||
* Retrurns zero if successful, or a negative error code on failure.
|
||||
*/
|
||||
int snd_register_device(int type, struct snd_card *card, int dev,
|
||||
struct file_operations *f_ops, void *private_data,
|
||||
const struct file_operations *f_ops, void *private_data,
|
||||
const char *name)
|
||||
{
|
||||
int minor;
|
||||
|
@@ -95,7 +95,7 @@ static int snd_oss_kernel_minor(int type, struct snd_card *card, int dev)
|
||||
}
|
||||
|
||||
int snd_register_oss_device(int type, struct snd_card *card, int dev,
|
||||
struct file_operations *f_ops, void *private_data,
|
||||
const struct file_operations *f_ops, void *private_data,
|
||||
const char *name)
|
||||
{
|
||||
int minor = snd_oss_kernel_minor(type, card, dev);
|
||||
|
Reference in New Issue
Block a user