10 files changed, 10 insertions, 11 deletions

diff --git a/drivers/staging/lirc/lirc_bt829.c b/drivers/staging/lirc/lirc_bt829.c
index d0f34b51f5b0..33881025426b 100644
--- a/drivers/staging/lirc/lirc_bt829.c
+++ b/drivers/staging/lirc/lirc_bt829.c
@@ -77,7 +77,7 @@ static struct pci_dev *do_pci_probe(void)
                 pci_addr_phys = 0;
                 if (my_dev->resource[0].flags & IORESOURCE_MEM) {
                         pci_addr_phys = my_dev->resource[0].start;
-                        printk(KERN_INFO DRIVER_NAME ": memory at 0x%08X \n",
+                        printk(KERN_INFO DRIVER_NAME ": memory at 0x%08X\n",
                                (unsigned int)pci_addr_phys);
                 }
                 if (pci_addr_phys == 0) {
diff --git a/drivers/staging/lirc/lirc_imon.c b/drivers/staging/lirc/lirc_imon.c
index 43856d6818dd..66493253042e 100644
--- a/drivers/staging/lirc/lirc_imon.c
+++ b/drivers/staging/lirc/lirc_imon.c
@@ -111,7 +111,7 @@ struct imon_context {
         } tx;
 };
 
-static struct file_operations display_fops = {
+static const struct file_operations display_fops = {
         .owner          = THIS_MODULE,
         .open           = &display_open,
         .write          = &vfd_write,
diff --git a/drivers/staging/lirc/lirc_it87.c b/drivers/staging/lirc/lirc_it87.c
index 781abc306c27..09f36961c6d2 100644
--- a/drivers/staging/lirc/lirc_it87.c
+++ b/drivers/staging/lirc/lirc_it87.c
@@ -329,7 +329,7 @@ static void add_read_queue(int flag, unsigned long val)
 }
 
 
-static struct file_operations lirc_fops = {
+static const struct file_operations lirc_fops = {
         .owner          = THIS_MODULE,
         .read           = lirc_read,
         .write          = lirc_write,
diff --git a/drivers/staging/lirc/lirc_parallel.c b/drivers/staging/lirc/lirc_parallel.c
index df12e7bd3f96..a1ebd071640f 100644
--- a/drivers/staging/lirc/lirc_parallel.c
+++ b/drivers/staging/lirc/lirc_parallel.c
@@ -539,7 +539,7 @@ static int lirc_close(struct inode *node, struct file *filep)
         return 0;
 }
 
-static struct file_operations lirc_fops = {
+static const struct file_operations lirc_fops = {
         .owner          = THIS_MODULE,
         .llseek         = lirc_lseek,
         .read           = lirc_read,
diff --git a/drivers/staging/lirc/lirc_sasem.c b/drivers/staging/lirc/lirc_sasem.c
index 9e516a112c29..73166c3f581f 100644
--- a/drivers/staging/lirc/lirc_sasem.c
+++ b/drivers/staging/lirc/lirc_sasem.c
@@ -119,7 +119,7 @@ struct sasem_context {
 };
 
 /* VFD file operations */
-static struct file_operations vfd_fops = {
+static const struct file_operations vfd_fops = {
         .owner          = THIS_MODULE,
         .open           = &vfd_open,
         .write          = &vfd_write,
diff --git a/drivers/staging/lirc/lirc_serial.c b/drivers/staging/lirc/lirc_serial.c
index d2ea3f0bd71d..9456f8e3f9ef 100644
--- a/drivers/staging/lirc/lirc_serial.c
+++ b/drivers/staging/lirc/lirc_serial.c
@@ -1050,7 +1050,7 @@ static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
         return 0;
 }
 
-static struct file_operations lirc_fops = {
+static const struct file_operations lirc_fops = {
         .owner          = THIS_MODULE,
         .write          = lirc_write,
         .unlocked_ioctl = lirc_ioctl,
diff --git a/drivers/staging/lirc/lirc_sir.c b/drivers/staging/lirc/lirc_sir.c
index 97146d1ee79f..eb08fa7138ba 100644
--- a/drivers/staging/lirc/lirc_sir.c
+++ b/drivers/staging/lirc/lirc_sir.c
@@ -451,7 +451,7 @@ static void add_read_queue(int flag, unsigned long val)
         wake_up_interruptible(&lirc_read_queue);
 }
 
-static struct file_operations lirc_fops = {
+static const struct file_operations lirc_fops = {
         .owner          = THIS_MODULE,
         .read           = lirc_read,
         .write          = lirc_write,
diff --git a/drivers/staging/lirc/lirc_streamzap.c b/drivers/staging/lirc/lirc_streamzap.c
index 5b46ac4dda78..be09c103f0c9 100644
--- a/drivers/staging/lirc/lirc_streamzap.c
+++ b/drivers/staging/lirc/lirc_streamzap.c
@@ -431,7 +431,7 @@ static void usb_streamzap_irq(struct urb *urb)
         return;
 }
 
-static struct file_operations streamzap_fops = {
+static const struct file_operations streamzap_fops = {
         .owner          = THIS_MODULE,
         .unlocked_ioctl = streamzap_ioctl,
         .read           = lirc_dev_fop_read,
diff --git a/drivers/staging/lirc/lirc_ttusbir.c b/drivers/staging/lirc/lirc_ttusbir.c
index 1f1da471491e..e345ab9a004c 100644
--- a/drivers/staging/lirc/lirc_ttusbir.c
+++ b/drivers/staging/lirc/lirc_ttusbir.c
@@ -141,8 +141,7 @@ static void set_use_dec(void *data)
  * still have about 14 samples per pulse/space, i.e. we sample with 14
  * times higher frequency than the signal frequency
  */
-const unsigned char map_table[] =
-{
+const unsigned char map_table[] = {
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/drivers/staging/lirc/lirc_zilog.c b/drivers/staging/lirc/lirc_zilog.c
index 1b013bf33899..100caab10451 100644
--- a/drivers/staging/lirc/lirc_zilog.c
+++ b/drivers/staging/lirc/lirc_zilog.c
@@ -1132,7 +1132,7 @@ static struct i2c_driver driver = {
         .id_table       = ir_transceiver_id,
 };
 
-static struct file_operations lirc_fops = {
+static const struct file_operations lirc_fops = {
         .owner          = THIS_MODULE,
         .llseek         = lseek,
         .read           = read,