mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
const: constify remaining file_operations
[[email protected]: fix KVM] Signed-off-by: Alexey Dobriyan <[email protected]> Acked-by: Mike Frysinger <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
1c4115e595
commit
828c09509b
57 changed files with 110 additions and 95 deletions
|
|
@ -1317,7 +1317,7 @@ static void sg_rq_end_io(struct request *rq, int uptodate)
|
|||
}
|
||||
}
|
||||
|
||||
static struct file_operations sg_fops = {
|
||||
static const struct file_operations sg_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.read = sg_read,
|
||||
.write = sg_write,
|
||||
|
|
@ -2194,9 +2194,11 @@ static int sg_proc_seq_show_int(struct seq_file *s, void *v);
|
|||
static int sg_proc_single_open_adio(struct inode *inode, struct file *file);
|
||||
static ssize_t sg_proc_write_adio(struct file *filp, const char __user *buffer,
|
||||
size_t count, loff_t *off);
|
||||
static struct file_operations adio_fops = {
|
||||
/* .owner, .read and .llseek added in sg_proc_init() */
|
||||
static const struct file_operations adio_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.open = sg_proc_single_open_adio,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.write = sg_proc_write_adio,
|
||||
.release = single_release,
|
||||
};
|
||||
|
|
@ -2204,23 +2206,32 @@ static struct file_operations adio_fops = {
|
|||
static int sg_proc_single_open_dressz(struct inode *inode, struct file *file);
|
||||
static ssize_t sg_proc_write_dressz(struct file *filp,
|
||||
const char __user *buffer, size_t count, loff_t *off);
|
||||
static struct file_operations dressz_fops = {
|
||||
static const struct file_operations dressz_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.open = sg_proc_single_open_dressz,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.write = sg_proc_write_dressz,
|
||||
.release = single_release,
|
||||
};
|
||||
|
||||
static int sg_proc_seq_show_version(struct seq_file *s, void *v);
|
||||
static int sg_proc_single_open_version(struct inode *inode, struct file *file);
|
||||
static struct file_operations version_fops = {
|
||||
static const struct file_operations version_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.open = sg_proc_single_open_version,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = single_release,
|
||||
};
|
||||
|
||||
static int sg_proc_seq_show_devhdr(struct seq_file *s, void *v);
|
||||
static int sg_proc_single_open_devhdr(struct inode *inode, struct file *file);
|
||||
static struct file_operations devhdr_fops = {
|
||||
static const struct file_operations devhdr_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.open = sg_proc_single_open_devhdr,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = single_release,
|
||||
};
|
||||
|
||||
|
|
@ -2229,8 +2240,11 @@ static int sg_proc_open_dev(struct inode *inode, struct file *file);
|
|||
static void * dev_seq_start(struct seq_file *s, loff_t *pos);
|
||||
static void * dev_seq_next(struct seq_file *s, void *v, loff_t *pos);
|
||||
static void dev_seq_stop(struct seq_file *s, void *v);
|
||||
static struct file_operations dev_fops = {
|
||||
static const struct file_operations dev_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.open = sg_proc_open_dev,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = seq_release,
|
||||
};
|
||||
static const struct seq_operations dev_seq_ops = {
|
||||
|
|
@ -2242,8 +2256,11 @@ static const struct seq_operations dev_seq_ops = {
|
|||
|
||||
static int sg_proc_seq_show_devstrs(struct seq_file *s, void *v);
|
||||
static int sg_proc_open_devstrs(struct inode *inode, struct file *file);
|
||||
static struct file_operations devstrs_fops = {
|
||||
static const struct file_operations devstrs_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.open = sg_proc_open_devstrs,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = seq_release,
|
||||
};
|
||||
static const struct seq_operations devstrs_seq_ops = {
|
||||
|
|
@ -2255,8 +2272,11 @@ static const struct seq_operations devstrs_seq_ops = {
|
|||
|
||||
static int sg_proc_seq_show_debug(struct seq_file *s, void *v);
|
||||
static int sg_proc_open_debug(struct inode *inode, struct file *file);
|
||||
static struct file_operations debug_fops = {
|
||||
static const struct file_operations debug_fops = {
|
||||
.owner = THIS_MODULE,
|
||||
.open = sg_proc_open_debug,
|
||||
.read = seq_read,
|
||||
.llseek = seq_lseek,
|
||||
.release = seq_release,
|
||||
};
|
||||
static const struct seq_operations debug_seq_ops = {
|
||||
|
|
@ -2269,7 +2289,7 @@ static const struct seq_operations debug_seq_ops = {
|
|||
|
||||
struct sg_proc_leaf {
|
||||
const char * name;
|
||||
struct file_operations * fops;
|
||||
const struct file_operations * fops;
|
||||
};
|
||||
|
||||
static struct sg_proc_leaf sg_proc_leaf_arr[] = {
|
||||
|
|
@ -2295,9 +2315,6 @@ sg_proc_init(void)
|
|||
for (k = 0; k < num_leaves; ++k) {
|
||||
leaf = &sg_proc_leaf_arr[k];
|
||||
mask = leaf->fops->write ? S_IRUGO | S_IWUSR : S_IRUGO;
|
||||
leaf->fops->owner = THIS_MODULE;
|
||||
leaf->fops->read = seq_read;
|
||||
leaf->fops->llseek = seq_lseek;
|
||||
proc_create(leaf->name, mask, sg_proc_sgp, leaf->fops);
|
||||
}
|
||||
return 0;
|
||||
|
|
|
|||
Loading…
Reference in a new issue