Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 36401
b: refs/heads/master
c: 066202d
h: refs/heads/master
i:
  36399: 6809700
v: v3
  • Loading branch information
Luiz Fernando N. Capitulino authored and Greg Kroah-Hartman committed Sep 27, 2006
1 parent 27097be commit ec4ae15
Show file tree
Hide file tree
Showing 25 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f2ebf92c9e1930a8f79b7eb49a32122931929014
refs/heads/master: 066202dd48cf3296b6cc22b5fcf89aef33fa0efc
2 changes: 1 addition & 1 deletion trunk/drivers/usb/class/usblp.c
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,7 @@ static unsigned int usblp_quirks (__u16 vendor, __u16 product)
return 0;
}

static struct file_operations usblp_fops = {
static const struct file_operations usblp_fops = {
.owner = THIS_MODULE,
.read = usblp_read,
.write = usblp_write,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/core/devices.c
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ static loff_t usb_device_lseek(struct file * file, loff_t offset, int orig)
return ret;
}

struct file_operations usbfs_devices_fops = {
const struct file_operations usbfs_devices_fops = {
.llseek = usb_device_lseek,
.read = usb_device_read,
.poll = usb_device_poll,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/core/devio.c
Original file line number Diff line number Diff line change
Expand Up @@ -1572,7 +1572,7 @@ static unsigned int usbdev_poll(struct file *file, struct poll_table_struct *wai
return mask;
}

struct file_operations usbfs_device_file_operations = {
const struct file_operations usbfs_device_file_operations = {
.llseek = usbdev_lseek,
.read = usbdev_read,
.poll = usbdev_poll,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/core/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ static int usb_open(struct inode * inode, struct file * file)
return err;
}

static struct file_operations usb_fops = {
static const struct file_operations usb_fops = {
.owner = THIS_MODULE,
.open = usb_open,
};
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/usb/core/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#include "hcd.h"

static struct super_operations usbfs_ops;
static struct file_operations default_file_operations;
static const struct file_operations default_file_operations;
static struct vfsmount *usbfs_mount;
static int usbfs_mount_count; /* = 0 */
static int ignore_mount = 0;
Expand Down Expand Up @@ -407,7 +407,7 @@ static int default_open (struct inode *inode, struct file *file)
return 0;
}

static struct file_operations default_file_operations = {
static const struct file_operations default_file_operations = {
.read = default_read_file,
.write = default_write_file,
.open = default_open,
Expand Down Expand Up @@ -494,7 +494,7 @@ static int fs_create_by_name (const char *name, mode_t mode,

static struct dentry *fs_create_file (const char *name, mode_t mode,
struct dentry *parent, void *data,
struct file_operations *fops,
const struct file_operations *fops,
uid_t uid, gid_t gid)
{
struct dentry *dentry;
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/usb/core/usb.h
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ extern const char *usbcore_name;
/* usbfs stuff */
extern struct mutex usbfs_mutex;
extern struct usb_driver usbfs_driver;
extern struct file_operations usbfs_devices_fops;
extern struct file_operations usbfs_device_file_operations;
extern const struct file_operations usbfs_devices_fops;
extern const struct file_operations usbfs_device_file_operations;
extern void usbfs_conn_disc_event(void);

extern int usbdev_init(void);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/gadget/at91_udc.c
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ static int proc_udc_open(struct inode *inode, struct file *file)
return single_open(file, proc_udc_show, PDE(inode)->data);
}

static struct file_operations proc_ops = {
static const struct file_operations proc_ops = {
.open = proc_udc_open,
.read = seq_read,
.llseek = seq_lseek,
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/usb/gadget/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,7 @@ ep_aio_write(struct kiocb *iocb, const char __user *ubuf, size_t len, loff_t o)
/*----------------------------------------------------------------------*/

/* used after endpoint configuration */
static struct file_operations ep_io_operations = {
static const struct file_operations ep_io_operations = {
.owner = THIS_MODULE,
.llseek = no_llseek,

Expand Down Expand Up @@ -873,7 +873,7 @@ ep_open (struct inode *inode, struct file *fd)
}

/* used before endpoint configuration */
static struct file_operations ep_config_operations = {
static const struct file_operations ep_config_operations = {
.owner = THIS_MODULE,
.llseek = no_llseek,

Expand Down Expand Up @@ -1247,7 +1247,7 @@ static int dev_ioctl (struct inode *inode, struct file *fd,
}

/* used after device configuration */
static struct file_operations ep0_io_operations = {
static const struct file_operations ep0_io_operations = {
.owner = THIS_MODULE,
.llseek = no_llseek,

Expand Down Expand Up @@ -1929,7 +1929,7 @@ dev_open (struct inode *inode, struct file *fd)
return value;
}

static struct file_operations dev_init_operations = {
static const struct file_operations dev_init_operations = {
.owner = THIS_MODULE,
.llseek = no_llseek,

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/gadget/omap_udc.c
Original file line number Diff line number Diff line change
Expand Up @@ -2437,7 +2437,7 @@ static int proc_udc_open(struct inode *inode, struct file *file)
return single_open(file, proc_udc_show, NULL);
}

static struct file_operations proc_ops = {
static const struct file_operations proc_ops = {
.open = proc_udc_open,
.read = seq_read,
.llseek = seq_lseek,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/host/isp116x-hcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1207,7 +1207,7 @@ static int isp116x_open_seq(struct inode *inode, struct file *file)
return single_open(file, isp116x_show_dbg, inode->i_private);
}

static struct file_operations isp116x_debug_fops = {
static const struct file_operations isp116x_debug_fops = {
.open = isp116x_open_seq,
.read = seq_read,
.llseek = seq_lseek,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/host/sl811-hcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -1517,7 +1517,7 @@ static int proc_sl811h_open(struct inode *inode, struct file *file)
return single_open(file, proc_sl811h_show, PDE(inode)->data);
}

static struct file_operations proc_ops = {
static const struct file_operations proc_ops = {
.open = proc_sl811h_open,
.read = seq_read,
.llseek = seq_lseek,
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/usb/host/uhci-debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include "uhci-hcd.h"

#define uhci_debug_operations (* (struct file_operations *) NULL)
#define uhci_debug_operations (* (const struct file_operations *) NULL)
static struct dentry *uhci_debugfs_root;

#ifdef DEBUG
Expand Down Expand Up @@ -500,7 +500,7 @@ static int uhci_debug_release(struct inode *inode, struct file *file)
}

#undef uhci_debug_operations
static struct file_operations uhci_debug_operations = {
static const struct file_operations uhci_debug_operations = {
.owner = THIS_MODULE,
.open = uhci_debug_open,
.llseek = uhci_debug_lseek,
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/usb/image/mdc800.c
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ static void mdc800_usb_download_notify (struct urb *urb, struct pt_regs *res)
***************************************************************************/

static struct usb_driver mdc800_usb_driver;
static struct file_operations mdc800_device_ops;
static const struct file_operations mdc800_device_ops;
static struct usb_class_driver mdc800_class = {
.name = "mdc800%d",
.fops = &mdc800_device_ops,
Expand Down Expand Up @@ -941,7 +941,7 @@ static ssize_t mdc800_device_write (struct file *file, const char __user *buf, s
****************************************************************************/

/* File Operations of this drivers */
static struct file_operations mdc800_device_ops =
static const struct file_operations mdc800_device_ops =
{
.owner = THIS_MODULE,
.read = mdc800_device_read,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/input/hiddev.c
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,7 @@ static int hiddev_ioctl(struct inode *inode, struct file *file, unsigned int cmd
return -EINVAL;
}

static struct file_operations hiddev_fops = {
static const struct file_operations hiddev_fops = {
.owner = THIS_MODULE,
.read = hiddev_read,
.write = hiddev_write,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/misc/auerswald.c
Original file line number Diff line number Diff line change
Expand Up @@ -1858,7 +1858,7 @@ static int auerchar_release (struct inode *inode, struct file *file)

/*----------------------------------------------------------------------*/
/* File operation structure */
static struct file_operations auerswald_fops =
static const struct file_operations auerswald_fops =
{
.owner = THIS_MODULE,
.llseek = no_llseek,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/misc/idmouse.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ static int idmouse_probe(struct usb_interface *interface,
static void idmouse_disconnect(struct usb_interface *interface);

/* file operation pointers */
static struct file_operations idmouse_fops = {
static const struct file_operations idmouse_fops = {
.owner = THIS_MODULE,
.read = idmouse_read,
.open = idmouse_open,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/misc/ldusb.c
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ static ssize_t ld_usb_write(struct file *file, const char __user *buffer,
}

/* file operations needed when we register this driver */
static struct file_operations ld_usb_fops = {
static const struct file_operations ld_usb_fops = {
.owner = THIS_MODULE,
.read = ld_usb_read,
.write = ld_usb_write,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/misc/legousbtower.c
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ static void tower_disconnect (struct usb_interface *interface);
static DEFINE_MUTEX (disconnect_mutex);

/* file operations needed when we register this driver */
static struct file_operations tower_fops = {
static const struct file_operations tower_fops = {
.owner = THIS_MODULE,
.read = tower_read,
.write = tower_write,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/misc/sisusbvga/sisusb.c
Original file line number Diff line number Diff line change
Expand Up @@ -3179,7 +3179,7 @@ sisusb_compat_ioctl(struct file *f, unsigned int cmd, unsigned long arg)
}
#endif

static struct file_operations usb_sisusb_fops = {
static const struct file_operations usb_sisusb_fops = {
.owner = THIS_MODULE,
.open = sisusb_open,
.release = sisusb_release,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/misc/usblcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ static ssize_t lcd_write(struct file *file, const char __user * user_buffer, siz
return retval;
}

static struct file_operations lcd_fops = {
static const struct file_operations lcd_fops = {
.owner = THIS_MODULE,
.read = lcd_read,
.write = lcd_write,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/mon/mon_stat.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ static int mon_stat_release(struct inode *inode, struct file *file)
return 0;
}

struct file_operations mon_fops_stat = {
const struct file_operations mon_fops_stat = {
.owner = THIS_MODULE,
.open = mon_stat_open,
.llseek = no_llseek,
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/mon/mon_text.c
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ static int mon_text_release(struct inode *inode, struct file *file)
return 0;
}

struct file_operations mon_fops_text = {
const struct file_operations mon_fops_text = {
.owner = THIS_MODULE,
.open = mon_text_open,
.llseek = no_llseek,
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/usb/mon/usb_mon.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ extern char mon_dmapeek(unsigned char *dst, dma_addr_t dma_addr, int len);

extern struct mutex mon_lock;

extern struct file_operations mon_fops_text;
extern struct file_operations mon_fops_stat;
extern const struct file_operations mon_fops_text;
extern const struct file_operations mon_fops_stat;

#endif /* __USB_MON_H */
2 changes: 1 addition & 1 deletion trunk/drivers/usb/usb-skeleton.c
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ static ssize_t skel_write(struct file *file, const char *user_buffer, size_t cou
return retval;
}

static struct file_operations skel_fops = {
static const struct file_operations skel_fops = {
.owner = THIS_MODULE,
.read = skel_read,
.write = skel_write,
Expand Down

0 comments on commit ec4ae15

Please sign in to comment.