174 files changed, 2345 insertions, 407 deletions

diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c
index 122c786449a9..d0a7df2e5ca7 100644
--- a/drivers/ata/pata_hpt37x.c
+++ b/drivers/ata/pata_hpt37x.c
@@ -624,7 +624,7 @@ static struct ata_port_operations hpt374_fn1_port_ops = {
 };
 
 /**
- *      htp37x_clock_slot       -       Turn timing to PC clock entry
+ *      hpt37x_clock_slot       -       Turn timing to PC clock entry
  *      @freq: Reported frequency timing
  *      @base: Base timing
  *
diff --git a/drivers/base/node.c b/drivers/base/node.c
index 91d4087b4039..1fe5536d404f 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -85,6 +85,8 @@ static ssize_t node_read_meminfo(struct sys_device * dev,
                        "Node %d FilePages:      %8lu kB\n"
                        "Node %d Mapped:         %8lu kB\n"
                        "Node %d AnonPages:      %8lu kB\n"
+                       "Node %d Shmem:          %8lu kB\n"
+                       "Node %d KernelStack:    %8lu kB\n"
                        "Node %d PageTables:     %8lu kB\n"
                        "Node %d NFS_Unstable:   %8lu kB\n"
                        "Node %d Bounce:         %8lu kB\n"
@@ -116,6 +118,9 @@ static ssize_t node_read_meminfo(struct sys_device * dev,
                        nid, K(node_page_state(nid, NR_FILE_PAGES)),
                        nid, K(node_page_state(nid, NR_FILE_MAPPED)),
                        nid, K(node_page_state(nid, NR_ANON_PAGES)),
+                       nid, K(node_page_state(nid, NR_SHMEM)),
+                       nid, node_page_state(nid, NR_KERNEL_STACK) *
+                                THREAD_SIZE / 1024,
                        nid, K(node_page_state(nid, NR_PAGETABLE)),
                        nid, K(node_page_state(nid, NR_UNSTABLE_NFS)),
                        nid, K(node_page_state(nid, NR_BOUNCE)),
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 1e6b7c14f697..c77b6f3c28ea 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -152,7 +152,7 @@ static int DAC960_revalidate_disk(struct gendisk *disk)
         return 0;
 }
 
-static struct block_device_operations DAC960_BlockDeviceOperations = {
+static const struct block_device_operations DAC960_BlockDeviceOperations = {
         .owner                  = THIS_MODULE,
         .open                   = DAC960_open,
         .getgeo                 = DAC960_getgeo,
@@ -6653,7 +6653,7 @@ static long DAC960_gam_ioctl(struct file *file, unsigned int Request,
         else ErrorCode = get_user(ControllerNumber,
                              &UserSpaceControllerInfo->ControllerNumber);
         if (ErrorCode != 0)
-                break;;
+                break;
         ErrorCode = -ENXIO;
         if (ControllerNumber < 0 ||
             ControllerNumber > DAC960_ControllerCount - 1) {
@@ -6661,7 +6661,7 @@ static long DAC960_gam_ioctl(struct file *file, unsigned int Request,
         }
         Controller = DAC960_Controllers[ControllerNumber];
         if (Controller == NULL)
-                break;;
+                break;
         memset(&ControllerInfo, 0, sizeof(DAC960_ControllerInfo_T));
         ControllerInfo.ControllerNumber = ControllerNumber;
         ControllerInfo.FirmwareType = Controller->FirmwareType;
@@ -7210,7 +7210,7 @@ static struct pci_driver DAC960_pci_driver = {
         .remove         = DAC960_Remove,
 };
 
-static int DAC960_init_module(void)
+static int __init DAC960_init_module(void)
 {
         int ret;
 
@@ -7222,7 +7222,7 @@ static int DAC960_init_module(void)
         return ret;
 }
 
-static void DAC960_cleanup_module(void)
+static void __exit DAC960_cleanup_module(void)
 {
         int i;
 
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index 2f07b7c99a95..055225839024 100644
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -1632,7 +1632,7 @@ static int amiga_floppy_change(struct gendisk *disk)
         return 0;
 }
 
-static struct block_device_operations floppy_fops = {
+static const struct block_device_operations floppy_fops = {
         .owner          = THIS_MODULE,
         .open           = floppy_open,
         .release        = floppy_release,
diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index b6cd571adbf2..3af97d4da2db 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -237,7 +237,7 @@ aoeblk_getgeo(struct block_device *bdev, struct hd_geometry *geo)
         return 0;
 }
 
-static struct block_device_operations aoe_bdops = {
+static const struct block_device_operations aoe_bdops = {
         .open = aoeblk_open,
         .release = aoeblk_release,
         .getgeo = aoeblk_getgeo,
diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index 3ff02941b3dd..847a9e57570a 100644
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -1856,7 +1856,7 @@ static int floppy_release(struct gendisk *disk, fmode_t mode)
         return 0;
 }
 
-static struct block_device_operations floppy_fops = {
+static const struct block_device_operations floppy_fops = {
         .owner          = THIS_MODULE,
         .open           = floppy_open,
         .release        = floppy_release,
diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index 4bf8705b3ace..4f688434daf1 100644
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -375,7 +375,7 @@ static int brd_ioctl(struct block_device *bdev, fmode_t mode,
         return error;
 }
 
-static struct block_device_operations brd_fops = {
+static const struct block_device_operations brd_fops = {
         .owner =                THIS_MODULE,
         .locked_ioctl =         brd_ioctl,
 #ifdef CONFIG_BLK_DEV_XIP
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index d8372b432826..4f19105f755c 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -205,7 +205,7 @@ static int cciss_compat_ioctl(struct block_device *, fmode_t,
                               unsigned, unsigned long);
 #endif
 
-static struct block_device_operations cciss_fops = {
+static const struct block_device_operations cciss_fops = {
         .owner = THIS_MODULE,
         .open = cciss_open,
         .release = cciss_release,
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index 44fa2018f6b0..b82d438e2607 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -193,7 +193,7 @@ static inline ctlr_info_t *get_host(struct gendisk *disk)
 }
 
 
-static struct block_device_operations ida_fops  = {
+static const struct block_device_operations ida_fops  = {
         .owner          = THIS_MODULE,
         .open           = ida_open,
         .release        = ida_release,
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 2b387c2260d8..5c01f747571b 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -3907,7 +3907,7 @@ static int floppy_revalidate(struct gendisk *disk)
         return res;
 }
 
-static struct block_device_operations floppy_fops = {
+static const struct block_device_operations floppy_fops = {
         .owner                  = THIS_MODULE,
         .open                   = floppy_open,
         .release                = floppy_release,
diff --git a/drivers/block/hd.c b/drivers/block/hd.c
index f9d01608cbe2..d5cdce08ffd2 100644
--- a/drivers/block/hd.c
+++ b/drivers/block/hd.c
@@ -692,7 +692,7 @@ static irqreturn_t hd_interrupt(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-static struct block_device_operations hd_fops = {
+static const struct block_device_operations hd_fops = {
         .getgeo =       hd_getgeo,
 };
 
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index bbb79441d895..edda9ea7c626 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -1438,7 +1438,7 @@ out_unlocked:
         return 0;
 }
 
-static struct block_device_operations lo_fops = {
+static const struct block_device_operations lo_fops = {
         .owner =        THIS_MODULE,
         .open =         lo_open,
         .release =      lo_release,
diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c
index 6d7fbaa92248..e0339aaa1815 100644
--- a/drivers/block/mg_disk.c
+++ b/drivers/block/mg_disk.c
@@ -775,7 +775,7 @@ static int mg_getgeo(struct block_device *bdev, struct hd_geometry *geo)
         return 0;
 }
 
-static struct block_device_operations mg_disk_ops = {
+static const struct block_device_operations mg_disk_ops = {
         .getgeo = mg_getgeo
 };
 
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 5d23ffad7c77..cc923a5b430c 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -722,7 +722,7 @@ static int nbd_ioctl(struct block_device *bdev, fmode_t mode,
         return error;
 }
 
-static struct block_device_operations nbd_fops =
+static const struct block_device_operations nbd_fops =
 {
         .owner =        THIS_MODULE,
         .locked_ioctl = nbd_ioctl,
diff --git a/drivers/block/osdblk.c b/drivers/block/osdblk.c
index 13c1aee6aa3f..a808b1530b3b 100644
--- a/drivers/block/osdblk.c
+++ b/drivers/block/osdblk.c
@@ -125,7 +125,7 @@ static struct class *class_osdblk;		/* /sys/class/osdblk */
 static DEFINE_MUTEX(ctl_mutex); /* Serialize open/close/setup/teardown */
 static LIST_HEAD(osdblkdev_list);
 
-static struct block_device_operations osdblk_bd_ops = {
+static const struct block_device_operations osdblk_bd_ops = {
         .owner          = THIS_MODULE,
 };
 
diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c
index 9f3518c515a1..8866ca369d5e 100644
--- a/drivers/block/paride/pcd.c
+++ b/drivers/block/paride/pcd.c
@@ -247,7 +247,7 @@ static int pcd_block_media_changed(struct gendisk *disk)
         return cdrom_media_changed(&cd->info);
 }
 
-static struct block_device_operations pcd_bdops = {
+static const struct block_device_operations pcd_bdops = {
         .owner          = THIS_MODULE,
         .open           = pcd_block_open,
         .release        = pcd_block_release,
diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c
index bf5955b3d873..569e39e8f114 100644
--- a/drivers/block/paride/pd.c
+++ b/drivers/block/paride/pd.c
@@ -807,7 +807,7 @@ static int pd_revalidate(struct gendisk *p)
         return 0;
 }
 
-static struct block_device_operations pd_fops = {
+static const struct block_device_operations pd_fops = {
         .owner          = THIS_MODULE,
         .open           = pd_open,
         .release        = pd_release,
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index 68a90834e993..ea54ea393553 100644
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -262,7 +262,7 @@ static char *pf_buf;		/* buffer for request in progress */
 
 /* kernel glue structures */
 
-static struct block_device_operations pf_fops = {
+static const struct block_device_operations pf_fops = {
         .owner          = THIS_MODULE,
         .open           = pf_open,
         .release        = pf_release,
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index fd5bb8ad59a9..2ddf03ae034e 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -2849,7 +2849,7 @@ static int pkt_media_changed(struct gendisk *disk)
         return attached_disk->fops->media_changed(attached_disk);
 }
 
-static struct block_device_operations pktcdvd_ops = {
+static const struct block_device_operations pktcdvd_ops = {
         .owner =                THIS_MODULE,
         .open =                 pkt_open,
         .release =              pkt_close,
diff --git a/drivers/block/ps3disk.c b/drivers/block/ps3disk.c
index 34cbb7f3efa8..03a130dca8ab 100644
--- a/drivers/block/ps3disk.c
+++ b/drivers/block/ps3disk.c
@@ -82,7 +82,7 @@ enum lv1_ata_in_out {
 static int ps3disk_major;
 
 
-static struct block_device_operations ps3disk_fops = {
+static const struct block_device_operations ps3disk_fops = {
         .owner          = THIS_MODULE,
 };
 
diff --git a/drivers/block/ps3vram.c b/drivers/block/ps3vram.c
index c8753a9ed290..3bb7c47c869f 100644
--- a/drivers/block/ps3vram.c
+++ b/drivers/block/ps3vram.c
@@ -88,7 +88,7 @@ struct ps3vram_priv {
 static int ps3vram_major;
 
 
-static struct block_device_operations ps3vram_fops = {
+static const struct block_device_operations ps3vram_fops = {
         .owner          = THIS_MODULE,
 };
 
diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c
index cbfd9c0aef03..411f064760b4 100644
--- a/drivers/block/sunvdc.c
+++ b/drivers/block/sunvdc.c
@@ -103,7 +103,7 @@ static int vdc_getgeo(struct block_device *bdev, struct hd_geometry *geo)
         return 0;
 }
 
-static struct block_device_operations vdc_fops = {
+static const struct block_device_operations vdc_fops = {
         .owner          = THIS_MODULE,
         .getgeo         = vdc_getgeo,
 };
diff --git a/drivers/block/swim.c b/drivers/block/swim.c
index cf7877fb8a7d..8f569e3df890 100644
--- a/drivers/block/swim.c
+++ b/drivers/block/swim.c
@@ -748,7 +748,7 @@ static int floppy_revalidate(struct gendisk *disk)
         return !fs->disk_in;
 }
 
-static struct block_device_operations floppy_fops = {
+static const struct block_device_operations floppy_fops = {
         .owner           = THIS_MODULE,
         .open            = floppy_open,
         .release         = floppy_release,
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c
index 80df93e3cdd0..6380ad8d91bd 100644
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@ -998,7 +998,7 @@ static int floppy_revalidate(struct gendisk *disk)
         return ret;
 }
 
-static struct block_device_operations floppy_fops = {
+static const struct block_device_operations floppy_fops = {
         .open           = floppy_open,
         .release        = floppy_release,
         .locked_ioctl   = floppy_ioctl,
@@ -1062,7 +1062,7 @@ static int swim3_add_device(struct macio_dev *mdev, int index)
                 goto out_release;
         }
         fs->swim3_intr = macio_irq(mdev, 0);
-        fs->dma_intr = macio_irq(mdev, 1);;
+        fs->dma_intr = macio_irq(mdev, 1);
         fs->cur_cyl = -1;
         fs->cur_sector = -1;
         fs->secpercyl = 36;
diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c
index f5cd2e83ebcc..a7c4184f4a63 100644
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@ -423,7 +423,7 @@ static struct pci_driver carm_driver = {
         .remove         = carm_remove_one,
 };
 
-static struct block_device_operations carm_bd_ops = {
+static const struct block_device_operations carm_bd_ops = {
         .owner          = THIS_MODULE,
         .getgeo         = carm_bdev_getgeo,
 };
diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index cc54473b8e77..c739b203fe91 100644
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -1789,7 +1789,7 @@ static int ub_bd_media_changed(struct gendisk *disk)
         return lun->changed;
 }
 
-static struct block_device_operations ub_bd_fops = {
+static const struct block_device_operations ub_bd_fops = {
         .owner          = THIS_MODULE,
         .open           = ub_bd_open,
         .release        = ub_bd_release,
diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index 858c34dd032d..ad1ba393801a 100644
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -140,7 +140,6 @@ struct cardinfo {
 };
 
 static struct cardinfo cards[MM_MAXCARDS];
-static struct block_device_operations mm_fops;
 static struct timer_list battery_timer;
 
 static int num_cards;
@@ -789,7 +788,7 @@ static int mm_check_change(struct gendisk *disk)
         return 0;
 }
 
-static struct block_device_operations mm_fops = {
+static const struct block_device_operations mm_fops = {
         .owner          = THIS_MODULE,
         .getgeo         = mm_getgeo,
         .revalidate_disk = mm_revalidate,
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index b441ce3832e9..a8c8b56b275e 100644
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -219,7 +219,7 @@ static int viodasd_getgeo(struct block_device *bdev, struct hd_geometry *geo)
 /*
  * Our file operations table
  */
-static struct block_device_operations viodasd_fops = {
+static const struct block_device_operations viodasd_fops = {
         .owner = THIS_MODULE,
         .open = viodasd_open,
         .release = viodasd_release,
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index aa1a3d5a3e2b..aa89fe45237d 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -243,7 +243,7 @@ static int virtblk_getgeo(struct block_device *bd, struct hd_geometry *geo)
         return 0;
 }
 
-static struct block_device_operations virtblk_fops = {
+static const struct block_device_operations virtblk_fops = {
         .locked_ioctl = virtblk_ioctl,
         .owner  = THIS_MODULE,
         .getgeo = virtblk_getgeo,
diff --git a/drivers/block/xd.c b/drivers/block/xd.c
index ce2429219925..0877d3628fda 100644
--- a/drivers/block/xd.c
+++ b/drivers/block/xd.c
@@ -130,7 +130,7 @@ static struct gendisk *xd_gendisk[2];
 
 static int xd_getgeo(struct block_device *bdev, struct hd_geometry *geo);
 
-static struct block_device_operations xd_fops = {
+static const struct block_device_operations xd_fops = {
         .owner  = THIS_MODULE,
         .locked_ioctl   = xd_ioctl,
         .getgeo = xd_getgeo,
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index e53284767f7c..b8578bb3f4c9 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -65,7 +65,7 @@ struct blk_shadow {
         unsigned long frame[BLKIF_MAX_SEGMENTS_PER_REQUEST];
 };
 
-static struct block_device_operations xlvbd_block_fops;
+static const struct block_device_operations xlvbd_block_fops;
 
 #define BLK_RING_SIZE __RING_SIZE((struct blkif_sring *)0, PAGE_SIZE)
 
@@ -1039,7 +1039,7 @@ static int blkif_release(struct gendisk *disk, fmode_t mode)
         return 0;
 }
 
-static struct block_device_operations xlvbd_block_fops =
+static const struct block_device_operations xlvbd_block_fops =
 {
         .owner = THIS_MODULE,
         .open = blkif_open,
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index b20abe102a2b..e5c5415eb45e 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -941,7 +941,7 @@ static int ace_getgeo(struct block_device *bdev, struct hd_geometry *geo)
         return 0;
 }
 
-static struct block_device_operations ace_fops = {
+static const struct block_device_operations ace_fops = {
         .owner = THIS_MODULE,
         .open = ace_open,
         .release = ace_release,
diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c
index b2590409f25e..64f941e0f14b 100644
--- a/drivers/block/z2ram.c
+++ b/drivers/block/z2ram.c
@@ -64,7 +64,6 @@ static int current_device   = -1;
 
 static DEFINE_SPINLOCK(z2ram_lock);
 
-static struct block_device_operations z2_fops;
 static struct gendisk *z2ram_gendisk;
 
 static void do_z2_request(struct request_queue *q)
@@ -315,7 +314,7 @@ z2_release(struct gendisk *disk, fmode_t mode)
     return 0;
 }
 
-static struct block_device_operations z2_fops =
+static const struct block_device_operations z2_fops =
 {
         .owner          = THIS_MODULE,
         .open           = z2_open,
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index b5621f27c4be..a762283d2a21 100644
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -512,7 +512,7 @@ static int gdrom_bdops_ioctl(struct block_device *bdev, fmode_t mode,
         return cdrom_ioctl(gd.cd_info, bdev, mode, cmd, arg);
 }
 
-static struct block_device_operations gdrom_bdops = {
+static const struct block_device_operations gdrom_bdops = {
         .owner                  = THIS_MODULE,
         .open                   = gdrom_bdops_open,
         .release                = gdrom_bdops_release,
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index 0fff646cc2f0..57ca69e0ac55 100644
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -177,7 +177,7 @@ static int viocd_blk_media_changed(struct gendisk *disk)
         return cdrom_media_changed(&di->viocd_info);
 }
 
-struct block_device_operations viocd_fops = {
+static const struct block_device_operations viocd_fops = {
         .owner =                THIS_MODULE,
         .open =                 viocd_blk_open,
         .release =              viocd_blk_release,
diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c
index ad87753f6de4..a56ca080e108 100644
--- a/drivers/char/agp/backend.c
+++ b/drivers/char/agp/backend.c
@@ -114,9 +114,9 @@ static int agp_find_max(void)
         long memory, index, result;
 
 #if PAGE_SHIFT < 20
-        memory = num_physpages >> (20 - PAGE_SHIFT);
+        memory = totalram_pages >> (20 - PAGE_SHIFT);
 #else
-        memory = num_physpages << (PAGE_SHIFT - 20);
+        memory = totalram_pages << (PAGE_SHIFT - 20);
 #endif
         index = 1;
 
diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c
index 20ef1bf5e726..703959eba45a 100644
--- a/drivers/char/agp/uninorth-agp.c
+++ b/drivers/char/agp/uninorth-agp.c
@@ -270,7 +270,7 @@ static void uninorth_agp_enable(struct agp_bridge_data *bridge, u32 mode)
 
         if ((uninorth_rev >= 0x30) && (uninorth_rev <= 0x33)) {
                 /*
-                 * We need to to set REQ_DEPTH to 7 for U3 versions 1.0, 2.1,
+                 * We need to set REQ_DEPTH to 7 for U3 versions 1.0, 2.1,
                  * 2.2 and 2.3, Darwin do so.
                  */
                 if ((command >> AGPSTAT_RQ_DEPTH_SHIFT) > 7)
diff --git a/drivers/char/epca.c b/drivers/char/epca.c
index ff647ca1c489..9d589e3144de 100644
--- a/drivers/char/epca.c
+++ b/drivers/char/epca.c
@@ -2239,7 +2239,7 @@ static void do_softint(struct work_struct *work)
         struct channel *ch = container_of(work, struct channel, tqueue);
         /* Called in response to a modem change event */
         if (ch && ch->magic == EPCA_MAGIC) {
-                struct tty_struct *tty = tty_port_tty_get(&ch->port);;
+                struct tty_struct *tty = tty_port_tty_get(&ch->port);
 
                 if (tty && tty->driver_data) {
                         if (test_and_clear_bit(EPCA_EVENT_HANGUP, &ch->event)) {
diff --git a/drivers/char/ipmi/ipmi_poweroff.c b/drivers/char/ipmi/ipmi_poweroff.c
index a261bd735dfb..2e66b5f773dd 100644
--- a/drivers/char/ipmi/ipmi_poweroff.c
+++ b/drivers/char/ipmi/ipmi_poweroff.c
@@ -691,7 +691,7 @@ static struct ctl_table_header *ipmi_table_header;
 /*
  * Startup and shutdown functions.
  */
-static int ipmi_poweroff_init(void)
+static int __init ipmi_poweroff_init(void)
 {
         int rv;
 
@@ -725,7 +725,7 @@ static int ipmi_poweroff_init(void)
 }
 
 #ifdef MODULE
-static __exit void ipmi_poweroff_cleanup(void)
+static void __exit ipmi_poweroff_cleanup(void)
 {
         int rv;
 
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index 881934c068c8..c250a31efa53 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -1017,7 +1017,7 @@ static ssize_t cmm_read(struct file *filp, __user char *buf, size_t count,
                 }
         }
 
-        if (dev->proto == 0 && count > dev->rlen - dev->rpos) {
+        if (dev->proto == 0 && count > dev->rlen - dev->rpos && i) {
                 DEBUGP(4, dev, "T=0 and count > buffer\n");
                 dev->rbuf[i] = dev->rbuf[i - 1];
                 dev->rbuf[i - 1] = dev->procbyte;
diff --git a/drivers/cpuidle/governors/menu.c b/drivers/cpuidle/governors/menu.c
index f1df59f59a37..68104434ebb5 100644
--- a/drivers/cpuidle/governors/menu.c
+++ b/drivers/cpuidle/governors/menu.c
@@ -2,8 +2,12 @@
  * menu.c - the menu idle governor
  *
  * Copyright (C) 2006-2007 Adam Belay <abelay@novell.com>
+ * Copyright (C) 2009 Intel Corporation
+ * Author:
+ *        Arjan van de Ven <arjan@linux.intel.com>
  *
- * This code is licenced under the GPL.
+ * This code is licenced under the GPL version 2 as described
+ * in the COPYING file that acompanies the Linux Kernel.
  */
 
 #include <linux/kernel.h>
@@ -13,22 +17,158 @@
 #include <linux/ktime.h>
 #include <linux/hrtimer.h>
 #include <linux/tick.h>
+#include <linux/sched.h>
 
-#define BREAK_FUZZ      4       /* 4 us */
-#define PRED_HISTORY_PCT        50
+#define BUCKETS 12
+#define RESOLUTION 1024
+#define DECAY 4
+#define MAX_INTERESTING 50000
+
+/*
+ * Concepts and ideas behind the menu governor
+ *
+ * For the menu governor, there are 3 decision factors for picking a C
+ * state:
+ * 1) Energy break even point
+ * 2) Performance impact
+ * 3) Latency tolerance (from pmqos infrastructure)
+ * These these three factors are treated independently.
+ *
+ * Energy break even point
+ * -----------------------
+ * C state entry and exit have an energy cost, and a certain amount of time in
+ * the  C state is required to actually break even on this cost. CPUIDLE
+ * provides us this duration in the "target_residency" field. So all that we
+ * need is a good prediction of how long we'll be idle. Like the traditional
+ * menu governor, we start with the actual known "next timer event" time.
+ *
+ * Since there are other source of wakeups (interrupts for example) than
+ * the next timer event, this estimation is rather optimistic. To get a
+ * more realistic estimate, a correction factor is applied to the estimate,
+ * that is based on historic behavior. For example, if in the past the actual
+ * duration always was 50% of the next timer tick, the correction factor will
+ * be 0.5.
+ *
+ * menu uses a running average for this correction factor, however it uses a
+ * set of factors, not just a single factor. This stems from the realization
+ * that the ratio is dependent on the order of magnitude of the expected
+ * duration; if we expect 500 milliseconds of idle time the likelihood of
+ * getting an interrupt very early is much higher than if we expect 50 micro
+ * seconds of idle time. A second independent factor that has big impact on
+ * the actual factor is if there is (disk) IO outstanding or not.
+ * (as a special twist, we consider every sleep longer than 50 milliseconds
+ * as perfect; there are no power gains for sleeping longer than this)
+ *
+ * For these two reasons we keep an array of 12 independent factors, that gets
+ * indexed based on the magnitude of the expected duration as well as the
+ * "is IO outstanding" property.
+ *
+ * Limiting Performance Impact
+ * ---------------------------
+ * C states, especially those with large exit latencies, can have a real
+ * noticable impact on workloads, which is not acceptable for most sysadmins,
+ * and in addition, less performance has a power price of its own.
+ *
+ * As a general rule of thumb, menu assumes that the following heuristic
+ * holds:
+ *     The busier the system, the less impact of C states is acceptable
+ *
+ * This rule-of-thumb is implemented using a performance-multiplier:
+ * If the exit latency times the performance multiplier is longer than
+ * the predicted duration, the C state is not considered a candidate
+ * for selection due to a too high performance impact. So the higher
+ * this multiplier is, the longer we need to be idle to pick a deep C
+ * state, and thus the less likely a busy CPU will hit such a deep
+ * C state.
+ *
+ * Two factors are used in determing this multiplier:
+ * a value of 10 is added for each point of "per cpu load average" we have.
+ * a value of 5 points is added for each process that is waiting for
+ * IO on this CPU.
+ * (these values are experimentally determined)
+ *
+ * The load average factor gives a longer term (few seconds) input to the
+ * decision, while the iowait value gives a cpu local instantanious input.
+ * The iowait factor may look low, but realize that this is also already
+ * represented in the system load average.
+ *
+ */
 
 struct menu_device {
         int             last_state_idx;
+        int             needs_update;
 
         unsigned int    expected_us;
-        unsigned int    predicted_us;
-        unsigned int    current_predicted_us;
-        unsigned int    last_measured_us;
-        unsigned int    elapsed_us;
+        u64             predicted_us;
+        unsigned int    measured_us;
+        unsigned int    exit_us;
+        unsigned int    bucket;
+        u64             correction_factor[BUCKETS];
 };
 
+
+#define LOAD_INT(x) ((x) >> FSHIFT)
+#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
+
+static int get_loadavg(void)
+{
+        unsigned long this = this_cpu_load();
+
+
+        return LOAD_INT(this) * 10 + LOAD_FRAC(this) / 10;
+}
+
+static inline int which_bucket(unsigned int duration)
+{
+        int bucket = 0;
+
+        /*
+         * We keep two groups of stats; one with no
+         * IO pending, one without.
+         * This allows us to calculate
+         * E(duration)|iowait
+         */
+        if (nr_iowait_cpu())
+                bucket = BUCKETS/2;
+
+        if (duration < 10)
+                return bucket;
+        if (duration < 100)
+                return bucket + 1;
+        if (duration < 1000)
+                return bucket + 2;
+        if (duration < 10000)
+                return bucket + 3;
+        if (duration < 100000)
+                return bucket + 4;
+        return bucket + 5;
+}
+
+/*
+ * Return a multiplier for the exit latency that is intended
+ * to take performance requirements into account.
+ * The more performance critical we estimate the system
+ * to be, the higher this multiplier, and thus the higher
+ * the barrier to go to an expensive C state.
+ */
+static inline int performance_multiplier(void)
+{
+        int mult = 1;
+
+        /* for higher loadavg, we are more reluctant */
+
+        mult += 2 * get_loadavg();
+
+        /* for IO wait tasks (per cpu!) we add 5x each */
+        mult += 10 * nr_iowait_cpu();
+
+        return mult;
+}
+
 static DEFINE_PER_CPU(struct menu_device, menu_devices);
 
+static void menu_update(struct cpuidle_device *dev);
+
 /**
  * menu_select - selects the next idle state to enter
  * @dev: the CPU
@@ -38,41 +178,68 @@ static int menu_select(struct cpuidle_device *dev)
         struct menu_device *data = &__get_cpu_var(menu_devices);
         int latency_req = pm_qos_requirement(PM_QOS_CPU_DMA_LATENCY);
         int i;
+        int multiplier;
+
+        data->last_state_idx = 0;
+        data->exit_us = 0;
+
+        if (data->needs_update) {
+                menu_update(dev);
+                data->needs_update = 0;
+        }
 
         /* Special case when user has set very strict latency requirement */
-        if (unlikely(latency_req == 0)) {
-                data->last_state_idx = 0;
+        if (unlikely(latency_req == 0))
                 return 0;
-        }
 
-        /* determine the expected residency time */
+        /* determine the expected residency time, round up */
         data->expected_us =
-                (u32) ktime_to_ns(tick_nohz_get_sleep_length()) / 1000;
+            DIV_ROUND_UP((u32)ktime_to_ns(tick_nohz_get_sleep_length()), 1000);
+
+
+        data->bucket = which_bucket(data->expected_us);
+
+        multiplier = performance_multiplier();
+
+        /*
+         * if the correction factor is 0 (eg first time init or cpu hotplug
+         * etc), we actually want to start out with a unity factor.
+         */
+        if (data->correction_factor[data->bucket] == 0)
+                data->correction_factor[data->bucket] = RESOLUTION * DECAY;
+
+        /* Make sure to round up for half microseconds */
+        data->predicted_us = DIV_ROUND_CLOSEST(
+                data->expected_us * data->correction_factor[data->bucket],
+                RESOLUTION * DECAY);
+
+        /*
+         * We want to default to C1 (hlt), not to busy polling
+         * unless the timer is happening really really soon.
+         */
+        if (data->expected_us > 5)
+                data->last_state_idx = CPUIDLE_DRIVER_STATE_START;
 
-        /* Recalculate predicted_us based on prediction_history_pct */
-        data->predicted_us *= PRED_HISTORY_PCT;
-        data->predicted_us += (100 - PRED_HISTORY_PCT) *
-                                data->current_predicted_us;
-        data->predicted_us /= 100;
 
         /* find the deepest idle state that satisfies our constraints */
-        for (i = CPUIDLE_DRIVER_STATE_START + 1; i < dev->state_count; i++) {
+        for (i = CPUIDLE_DRIVER_STATE_START; i < dev->state_count; i++) {
                 struct cpuidle_state *s = &dev->states[i];
 
-                if (s->target_residency > data->expected_us)
-                        break;
                 if (s->target_residency > data->predicted_us)
                         break;
                 if (s->exit_latency > latency_req)
                         break;
+                if (s->exit_latency * multiplier > data->predicted_us)
+                        break;
+                data->exit_us = s->exit_latency;
+                data->last_state_idx = i;
         }
 
-        data->last_state_idx = i - 1;
-        return i - 1;
+        return data->last_state_idx;
 }
 
 /**
- * menu_reflect - attempts to guess what happened after entry
+ * menu_reflect - records that data structures need update
  * @dev: the CPU
  *
  * NOTE: it's important to be fast here because this operation will add to
@@ -81,39 +248,63 @@ static int menu_select(struct cpuidle_device *dev)
 static void menu_reflect(struct cpuidle_device *dev)
 {
         struct menu_device *data = &__get_cpu_var(menu_devices);
+        data->needs_update = 1;
+}
+
+/**
+ * menu_update - attempts to guess what happened after entry
+ * @dev: the CPU
+ */
+static void menu_update(struct cpuidle_device *dev)
+{
+        struct menu_device *data = &__get_cpu_var(menu_devices);
         int last_idx = data->last_state_idx;
         unsigned int last_idle_us = cpuidle_get_last_residency(dev);
         struct cpuidle_state *target = &dev->states[last_idx];
         unsigned int measured_us;
+        u64 new_factor;
 
         /*
          * Ugh, this idle state doesn't support residency measurements, so we
          * are basically lost in the dark.  As a compromise, assume we slept
-         * for one full standard timer tick.  However, be aware that this
-         * could potentially result in a suboptimal state transition.
+         * for the whole expected time.
          */
         if (unlikely(!(target->flags & CPUIDLE_FLAG_TIME_VALID)))
-                last_idle_us = USEC_PER_SEC / HZ;
+                last_idle_us = data->expected_us;
+
+
+        measured_us = last_idle_us;
 
         /*
-         * measured_us and elapsed_us are the cumulative idle time, since the
-         * last time we were woken out of idle by an interrupt.
+         * We correct for the exit latency; we are assuming here that the
+         * exit latency happens after the event that we're interested in.
          */
-        if (data->elapsed_us <= data->elapsed_us + last_idle_us)
-                measured_us = data->elapsed_us + last_idle_us;
+        if (measured_us > data->exit_us)
+                measured_us -= data->exit_us;
+
+
+        /* update our correction ratio */
+
+        new_factor = data->correction_factor[data->bucket]
+                        * (DECAY - 1) / DECAY;
+
+        if (data->expected_us > 0 && data->measured_us < MAX_INTERESTING)
+                new_factor += RESOLUTION * measured_us / data->expected_us;
         else
-                measured_us = -1;
+                /*
+                 * we were idle so long that we count it as a perfect
+                 * prediction
+                 */
+                new_factor += RESOLUTION;
 
-        /* Predict time until next break event */
-        data->current_predicted_us = max(measured_us, data->last_measured_us);
+        /*
+         * We don't want 0 as factor; we always want at least
+         * a tiny bit of estimated time.
+         */
+        if (new_factor == 0)
+                new_factor = 1;
 
-        if (last_idle_us + BREAK_FUZZ <
-            data->expected_us - target->exit_latency) {
-                data->last_measured_us = measured_us;
-                data->elapsed_us = 0;
-        } else {
-                data->elapsed_us = measured_us;
-        }
+        data->correction_factor[data->bucket] = new_factor;
 }
 
 /**
diff --git a/drivers/edac/edac_core.h b/drivers/edac/edac_core.h
index 871c13b4c148..12f355cafdbe 100644
--- a/drivers/edac/edac_core.h
+++ b/drivers/edac/edac_core.h
@@ -286,7 +286,7 @@ enum scrub_type {
  *                      is irrespective of the memory devices being mounted
  *                      on both sides of the memory stick.
  *
- * Socket set:          All of the memory sticks that are required for for
+ * Socket set:          All of the memory sticks that are required for
  *                      a single memory access or all of the memory sticks
  *                      spanned by a chip-select row.  A single socket set
  *                      has two chip-select rows and if double-sided sticks
diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c
index d5ea8a68d338..56f9234781fa 100644
--- a/drivers/firmware/memmap.c
+++ b/drivers/firmware/memmap.c
@@ -164,7 +164,7 @@ int __init firmware_map_add_early(u64 start, u64 end, const char *type)
 {
         struct firmware_map_entry *entry;
 
-        entry = alloc_bootmem_low(sizeof(struct firmware_map_entry));
+        entry = alloc_bootmem(sizeof(struct firmware_map_entry));
         if (WARN_ON(!entry))
                 return -ENOMEM;
 
diff --git a/drivers/gpio/bt8xxgpio.c b/drivers/gpio/bt8xxgpio.c
index 984b587f0f96..55904140213b 100644
--- a/drivers/gpio/bt8xxgpio.c
+++ b/drivers/gpio/bt8xxgpio.c
@@ -331,13 +331,13 @@ static struct pci_driver bt8xxgpio_pci_driver = {
         .resume         = bt8xxgpio_resume,
 };
 
-static int bt8xxgpio_init(void)
+static int __init bt8xxgpio_init(void)
 {
         return pci_register_driver(&bt8xxgpio_pci_driver);
 }
 module_init(bt8xxgpio_init)
 
-static void bt8xxgpio_exit(void)
+static void __exit bt8xxgpio_exit(void)
 {
         pci_unregister_driver(&bt8xxgpio_pci_driver);
 }
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 2b914d732076..f4856a510476 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -232,7 +232,7 @@ intel_dp_aux_ch(struct intel_output *intel_output,
         for (try = 0; try < 5; try++) {
                 /* Load the send data into the aux channel data registers */
                 for (i = 0; i < send_bytes; i += 4) {
-                        uint32_t    d = pack_aux(send + i, send_bytes - i);;
+                        uint32_t    d = pack_aux(send + i, send_bytes - i);
         
                         I915_WRITE(ch_data + i, d);
                 }
diff --git a/drivers/gpu/drm/mga/mga_state.c b/drivers/gpu/drm/mga/mga_state.c
index b710fab21cb3..a53b848e0f17 100644
--- a/drivers/gpu/drm/mga/mga_state.c
+++ b/drivers/gpu/drm/mga/mga_state.c
@@ -239,7 +239,7 @@ static __inline__ void mga_g200_emit_pipe(drm_mga_private_t * dev_priv)
                   MGA_WR34, 0x00000000,
                   MGA_WR42, 0x0000ffff, MGA_WR60, 0x0000ffff);
 
-        /* Padding required to to hardware bug.
+        /* Padding required due to hardware bug.
          */
         DMA_BLOCK(MGA_DMAPAD, 0xffffffff,
                   MGA_DMAPAD, 0xffffffff,
@@ -317,7 +317,7 @@ static __inline__ void mga_g400_emit_pipe(drm_mga_private_t * dev_priv)
                   MGA_WR52, MGA_G400_WR_MAGIC,  /* tex1 width        */
                   MGA_WR60, MGA_G400_WR_MAGIC); /* tex1 height       */
 
-        /* Padding required to to hardware bug */
+        /* Padding required due to hardware bug */
         DMA_BLOCK(MGA_DMAPAD, 0xffffffff,
                   MGA_DMAPAD, 0xffffffff,
                   MGA_DMAPAD, 0xffffffff,
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 111afbe8de03..24d90ea246ce 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -205,13 +205,6 @@ config HID_NTRIG
         Support for N-Trig touch screen.
 
 config HID_PANTHERLORD
-        tristate "Pantherlord devices support" if EMBEDDED
-        depends on USB_HID
-        default !EMBEDDED
-        ---help---
-        Support for PantherLord/GreenAsia based device support.
-
-config HID_PANTHERLORD
         tristate "Pantherlord support" if EMBEDDED
         depends on USB_HID
         default !EMBEDDED
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 342b7d36d7bb..be34d32906bd 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1089,8 +1089,7 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i
                 return -1;
         }
 
-        buf = kmalloc(sizeof(char) * HID_DEBUG_BUFSIZE,
-                        interrupt ? GFP_ATOMIC : GFP_KERNEL);
+        buf = kmalloc(sizeof(char) * HID_DEBUG_BUFSIZE, GFP_ATOMIC);
 
         if (!buf) {
                 report = hid_get_report(report_enum, data);
@@ -1238,6 +1237,17 @@ int hid_connect(struct hid_device *hdev, unsigned int connect_mask)
 }
 EXPORT_SYMBOL_GPL(hid_connect);
 
+void hid_disconnect(struct hid_device *hdev)
+{
+        if (hdev->claimed & HID_CLAIMED_INPUT)
+                hidinput_disconnect(hdev);
+        if (hdev->claimed & HID_CLAIMED_HIDDEV)
+                hdev->hiddev_disconnect(hdev);
+        if (hdev->claimed & HID_CLAIMED_HIDRAW)
+                hidraw_disconnect(hdev);
+}
+EXPORT_SYMBOL_GPL(hid_disconnect);
+
 /* a list of devices for which there is a specialized driver on HID bus */
 static const struct hid_device_id hid_blacklist[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) },
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index 1b0e07a67d6d..03bd703255a3 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -1041,13 +1041,6 @@ static void usbhid_stop(struct hid_device *hid)
 
         hid_cancel_delayed_stuff(usbhid);
 
-        if (hid->claimed & HID_CLAIMED_INPUT)
-                hidinput_disconnect(hid);
-        if (hid->claimed & HID_CLAIMED_HIDDEV)
-                hiddev_disconnect(hid);
-        if (hid->claimed & HID_CLAIMED_HIDRAW)
-                hidraw_disconnect(hid);
-
         hid->claimed = 0;
 
         usb_free_urb(usbhid->urbin);
@@ -1085,7 +1078,7 @@ static struct hid_ll_driver usb_hid_driver = {
         .hidinput_input_event = usb_hidinput_input_event,
 };
 
-static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
+static int usbhid_probe(struct usb_interface *intf, const struct usb_device_id *id)
 {
         struct usb_host_interface *interface = intf->cur_altsetting;
         struct usb_device *dev = interface_to_usbdev(intf);
@@ -1117,6 +1110,7 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
         hid->ff_init = hid_pidff_init;
 #ifdef CONFIG_USB_HIDDEV
         hid->hiddev_connect = hiddev_connect;
+        hid->hiddev_disconnect = hiddev_disconnect;
         hid->hiddev_hid_event = hiddev_hid_event;
         hid->hiddev_report_event = hiddev_report_event;
 #endif
@@ -1177,7 +1171,7 @@ err:
         return ret;
 }
 
-static void hid_disconnect(struct usb_interface *intf)
+static void usbhid_disconnect(struct usb_interface *intf)
 {
         struct hid_device *hid = usb_get_intfdata(intf);
         struct usbhid_device *usbhid;
@@ -1359,8 +1353,8 @@ MODULE_DEVICE_TABLE (usb, hid_usb_ids);
 
 static struct usb_driver hid_driver = {
         .name =         "usbhid",
-        .probe =        hid_probe,
-        .disconnect =   hid_disconnect,
+        .probe =        usbhid_probe,
+        .disconnect =   usbhid_disconnect,
 #ifdef CONFIG_PM
         .suspend =      hid_suspend,
         .resume =       hid_resume,
diff --git a/drivers/hwmon/adm1021.c b/drivers/hwmon/adm1021.c
index b11e06f644b1..afc594318125 100644
--- a/drivers/hwmon/adm1021.c
+++ b/drivers/hwmon/adm1021.c
@@ -83,16 +83,14 @@ struct adm1021_data {
 
         struct mutex update_lock;
         char valid;             /* !=0 if following fields are valid */
+        char low_power;         /* !=0 if device in low power mode */
         unsigned long last_updated;     /* In jiffies */
 
-        s8 temp_max[2];         /* Register values */
-        s8 temp_min[2];
-        s8 temp[2];
+        int temp_max[2];                /* Register values */
+        int temp_min[2];
+        int temp[2];
         u8 alarms;
         /* Special values for ADM1023 only */
-        u8 remote_temp_prec;
-        u8 remote_temp_os_prec;
-        u8 remote_temp_hyst_prec;
         u8 remote_temp_offset;
         u8 remote_temp_offset_prec;
 };
@@ -141,7 +139,7 @@ static ssize_t show_temp(struct device *dev,
         int index = to_sensor_dev_attr(devattr)->index;
         struct adm1021_data *data = adm1021_update_device(dev);
 
-        return sprintf(buf, "%d\n", 1000 * data->temp[index]);
+        return sprintf(buf, "%d\n", data->temp[index]);
 }
 
 static ssize_t show_temp_max(struct device *dev,
@@ -150,7 +148,7 @@ static ssize_t show_temp_max(struct device *dev,
         int index = to_sensor_dev_attr(devattr)->index;
         struct adm1021_data *data = adm1021_update_device(dev);
 
-        return sprintf(buf, "%d\n", 1000 * data->temp_max[index]);
+        return sprintf(buf, "%d\n", data->temp_max[index]);
 }
 
 static ssize_t show_temp_min(struct device *dev,
@@ -159,7 +157,7 @@ static ssize_t show_temp_min(struct device *dev,
         int index = to_sensor_dev_attr(devattr)->index;
         struct adm1021_data *data = adm1021_update_device(dev);
 
-        return sprintf(buf, "%d\n", 1000 * data->temp_min[index]);
+        return sprintf(buf, "%d\n", data->temp_min[index]);
 }
 
 static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,
@@ -216,6 +214,35 @@ static ssize_t set_temp_min(struct device *dev,
         return count;
 }
 
+static ssize_t show_low_power(struct device *dev,
+                              struct device_attribute *devattr, char *buf)
+{
+        struct adm1021_data *data = adm1021_update_device(dev);
+        return sprintf(buf, "%d\n", data->low_power);
+}
+
+static ssize_t set_low_power(struct device *dev,
+                             struct device_attribute *devattr,
+                             const char *buf, size_t count)
+{
+        struct i2c_client *client = to_i2c_client(dev);
+        struct adm1021_data *data = i2c_get_clientdata(client);
+        int low_power = simple_strtol(buf, NULL, 10) != 0;
+
+        mutex_lock(&data->update_lock);
+        if (low_power != data->low_power) {
+                int config = i2c_smbus_read_byte_data(
+                        client, ADM1021_REG_CONFIG_R);
+                data->low_power = low_power;
+                i2c_smbus_write_byte_data(client, ADM1021_REG_CONFIG_W,
+                        (config & 0xBF) | (low_power << 6));
+        }
+        mutex_unlock(&data->update_lock);
+
+        return count;
+}
+
+
 static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);
 static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp_max,
                           set_temp_max, 0);
@@ -233,6 +260,7 @@ static SENSOR_DEVICE_ATTR(temp2_min_alarm, S_IRUGO, show_alarm, NULL, 3);
 static SENSOR_DEVICE_ATTR(temp2_fault, S_IRUGO, show_alarm, NULL, 2);
 
 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
+static DEVICE_ATTR(low_power, S_IWUSR | S_IRUGO, show_low_power, set_low_power);
 
 static struct attribute *adm1021_attributes[] = {
         &sensor_dev_attr_temp1_max.dev_attr.attr,
@@ -247,6 +275,7 @@ static struct attribute *adm1021_attributes[] = {
         &sensor_dev_attr_temp2_min_alarm.dev_attr.attr,
         &sensor_dev_attr_temp2_fault.dev_attr.attr,
         &dev_attr_alarms.attr,
+        &dev_attr_low_power.attr,
         NULL
 };
 
@@ -412,25 +441,27 @@ static struct adm1021_data *adm1021_update_device(struct device *dev)
                 dev_dbg(&client->dev, "Starting adm1021 update\n");
 
                 for (i = 0; i < 2; i++) {
-                        data->temp[i] = i2c_smbus_read_byte_data(client,
-                                                ADM1021_REG_TEMP(i));
-                        data->temp_max[i] = i2c_smbus_read_byte_data(client,
-                                                ADM1021_REG_TOS_R(i));
-                        data->temp_min[i] = i2c_smbus_read_byte_data(client,
-                                                ADM1021_REG_THYST_R(i));
+                        data->temp[i] = 1000 *
+                                (s8) i2c_smbus_read_byte_data(
+                                        client, ADM1021_REG_TEMP(i));
+                        data->temp_max[i] = 1000 *
+                                (s8) i2c_smbus_read_byte_data(
+                                        client, ADM1021_REG_TOS_R(i));
+                        data->temp_min[i] = 1000 *
+                                (s8) i2c_smbus_read_byte_data(
+                                        client, ADM1021_REG_THYST_R(i));
                 }
                 data->alarms = i2c_smbus_read_byte_data(client,
                                                 ADM1021_REG_STATUS) & 0x7c;
                 if (data->type == adm1023) {
-                        data->remote_temp_prec =
-                                i2c_smbus_read_byte_data(client,
-                                                ADM1023_REG_REM_TEMP_PREC);
-                        data->remote_temp_os_prec =
-                                i2c_smbus_read_byte_data(client,
-                                                ADM1023_REG_REM_TOS_PREC);
-                        data->remote_temp_hyst_prec =
-                                i2c_smbus_read_byte_data(client,
-                                                ADM1023_REG_REM_THYST_PREC);
+                        /* The ADM1023 provides 3 extra bits of precision for
+                         * the remote sensor in extra registers. */
+                        data->temp[1] += 125 * (i2c_smbus_read_byte_data(
+                                client, ADM1023_REG_REM_TEMP_PREC) >> 5);
+                        data->temp_max[1] += 125 * (i2c_smbus_read_byte_data(
+                                client, ADM1023_REG_REM_TOS_PREC) >> 5);
+                        data->temp_min[1] += 125 * (i2c_smbus_read_byte_data(
+                                client, ADM1023_REG_REM_THYST_PREC) >> 5);
                         data->remote_temp_offset =
                                 i2c_smbus_read_byte_data(client,
                                                 ADM1023_REG_REM_OFFSET);
diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index 753b34885f9d..7ea6a8f66056 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -178,6 +178,8 @@ static const int debug;
 static struct platform_device *pdev;
 static s16 rest_x;
 static s16 rest_y;
+static u8 backlight_state[2];
+
 static struct device *hwmon_dev;
 static struct input_polled_dev *applesmc_idev;
 
@@ -497,17 +499,36 @@ static int applesmc_probe(struct platform_device *dev)
         return 0;
 }
 
-static int applesmc_resume(struct platform_device *dev)
+/* Synchronize device with memorized backlight state */
+static int applesmc_pm_resume(struct device *dev)
 {
-        return applesmc_device_init();
+        mutex_lock(&applesmc_lock);
+        if (applesmc_light)
+                applesmc_write_key(BACKLIGHT_KEY, backlight_state, 2);
+        mutex_unlock(&applesmc_lock);
+        return 0;
 }
 
+/* Reinitialize device on resume from hibernation */
+static int applesmc_pm_restore(struct device *dev)
+{
+        int ret = applesmc_device_init();
+        if (ret)
+                return ret;
+        return applesmc_pm_resume(dev);
+}
+
+static struct dev_pm_ops applesmc_pm_ops = {
+        .resume = applesmc_pm_resume,
+        .restore = applesmc_pm_restore,
+};
+
 static struct platform_driver applesmc_driver = {
         .probe = applesmc_probe,
-        .resume = applesmc_resume,
         .driver = {
                 .name = "applesmc",
                 .owner = THIS_MODULE,
+                .pm = &applesmc_pm_ops,
         },
 };
 
@@ -804,17 +825,10 @@ static ssize_t applesmc_calibrate_store(struct device *dev,
         return count;
 }
 
-/* Store the next backlight value to be written by the work */
-static unsigned int backlight_value;
-
 static void applesmc_backlight_set(struct work_struct *work)
 {
-        u8 buffer[2];
-
         mutex_lock(&applesmc_lock);
-        buffer[0] = backlight_value;
-        buffer[1] = 0x00;
-        applesmc_write_key(BACKLIGHT_KEY, buffer, 2);
+        applesmc_write_key(BACKLIGHT_KEY, backlight_state, 2);
         mutex_unlock(&applesmc_lock);
 }
 static DECLARE_WORK(backlight_work, &applesmc_backlight_set);
@@ -824,7 +838,7 @@ static void applesmc_brightness_set(struct led_classdev *led_cdev,
 {
         int ret;
 
-        backlight_value = value;
+        backlight_state[0] = value;
         ret = queue_work(applesmc_led_wq, &backlight_work);
 
         if (debug && (!ret))
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index 93c17223b527..972cf4ba963c 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -185,7 +185,7 @@ static int __devinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *
                 }
         }
 
-        if (ismobile) {
+        if (ismobile || c->x86_model == 0x1c) {
 
                 err = rdmsr_safe_on_cpu(id, 0xee, &eax, &edx);
                 if (err) {
@@ -417,7 +417,7 @@ static int __init coretemp_init(void)
                 if ((c->cpuid_level < 0) || (c->x86 != 0x6) ||
                     !((c->x86_model == 0xe) || (c->x86_model == 0xf) ||
                         (c->x86_model == 0x16) || (c->x86_model == 0x17) ||
-                        (c->x86_model == 0x1A))) {
+                        (c->x86_model == 0x1A) || (c->x86_model == 0x1c))) {
 
                         /* supported CPU not found, but report the unknown
                            family 6 CPU */
diff --git a/drivers/hwmon/lis3lv02d.c b/drivers/hwmon/lis3lv02d.c
index 271338bdb6be..cf5afb9a10ab 100644
--- a/drivers/hwmon/lis3lv02d.c
+++ b/drivers/hwmon/lis3lv02d.c
@@ -454,6 +454,15 @@ int lis3lv02d_init_device(struct lis3lv02d *dev)
                                         (p->click_thresh_y << 4));
                 }
 
+                if (p->wakeup_flags && (dev->whoami == LIS_SINGLE_ID)) {
+                        dev->write(dev, FF_WU_CFG_1, p->wakeup_flags);
+                        dev->write(dev, FF_WU_THS_1, p->wakeup_thresh & 0x7f);
+                        /* default to 2.5ms for now */
+                        dev->write(dev, FF_WU_DURATION_1, 1);
+                        /* enable high pass filter for both free-fall units */
+                        dev->write(dev, CTRL_REG2, HP_FF_WU1 | HP_FF_WU2);
+                }
+
                 if (p->irq_cfg)
                         dev->write(dev, CTRL_REG3, p->irq_cfg);
         }
diff --git a/drivers/hwmon/lis3lv02d.h b/drivers/hwmon/lis3lv02d.h
index e320e2f511f1..3e1ff46f72d3 100644
--- a/drivers/hwmon/lis3lv02d.h
+++ b/drivers/hwmon/lis3lv02d.h
@@ -58,15 +58,17 @@ enum lis3_reg {
         OUTZ_L          = 0x2C,
         OUTZ_H          = 0x2D,
         OUTZ            = 0x2D,
-        FF_WU_CFG       = 0x30,
-        FF_WU_SRC       = 0x31,
-        FF_WU_ACK       = 0x32,
-        FF_WU_THS_L     = 0x34,
-        FF_WU_THS_H     = 0x35,
-        FF_WU_DURATION  = 0x36,
 };
 
 enum lis302d_reg {
+        FF_WU_CFG_1     = 0x30,
+        FF_WU_SRC_1     = 0x31,
+        FF_WU_THS_1     = 0x32,
+        FF_WU_DURATION_1 = 0x33,
+        FF_WU_CFG_2     = 0x34,
+        FF_WU_SRC_2     = 0x35,
+        FF_WU_THS_2     = 0x36,
+        FF_WU_DURATION_2 = 0x37,
         CLICK_CFG       = 0x38,
         CLICK_SRC       = 0x39,
         CLICK_THSY_X    = 0x3B,
@@ -77,6 +79,12 @@ enum lis302d_reg {
 };
 
 enum lis3lv02d_reg {
+        FF_WU_CFG       = 0x30,
+        FF_WU_SRC       = 0x31,
+        FF_WU_ACK       = 0x32,
+        FF_WU_THS_L     = 0x34,
+        FF_WU_THS_H     = 0x35,
+        FF_WU_DURATION  = 0x36,
         DD_CFG          = 0x38,
         DD_SRC          = 0x39,
         DD_ACK          = 0x3A,
@@ -107,6 +115,10 @@ enum lis3lv02d_ctrl2 {
         CTRL2_FS        = 0x80, /* Full Scale selection */
 };
 
+enum lis302d_ctrl2 {
+        HP_FF_WU2       = 0x08,
+        HP_FF_WU1       = 0x04,
+};
 
 enum lis3lv02d_ctrl3 {
         CTRL3_CFS0      = 0x01,
diff --git a/drivers/hwmon/lis3lv02d_spi.c b/drivers/hwmon/lis3lv02d_spi.c
index 3827ff04485f..82ebca5a699c 100644
--- a/drivers/hwmon/lis3lv02d_spi.c
+++ b/drivers/hwmon/lis3lv02d_spi.c
@@ -66,17 +66,16 @@ static int __devinit lis302dl_spi_probe(struct spi_device *spi)
         if (ret < 0)
                 return ret;
 
-        lis3_dev.bus_priv = spi;
-        lis3_dev.init = lis3_spi_init;
-        lis3_dev.read = lis3_spi_read;
-        lis3_dev.write = lis3_spi_write;
-        lis3_dev.irq = spi->irq;
-        lis3_dev.ac = lis3lv02d_axis_normal;
-        lis3_dev.pdata = spi->dev.platform_data;
+        lis3_dev.bus_priv       = spi;
+        lis3_dev.init           = lis3_spi_init;
+        lis3_dev.read           = lis3_spi_read;
+        lis3_dev.write          = lis3_spi_write;
+        lis3_dev.irq            = spi->irq;
+        lis3_dev.ac             = lis3lv02d_axis_normal;
+        lis3_dev.pdata          = spi->dev.platform_data;
         spi_set_drvdata(spi, &lis3_dev);
 
-        ret = lis3lv02d_init_device(&lis3_dev);
-        return ret;
+        return lis3lv02d_init_device(&lis3_dev);
 }
 
 static int __devexit lis302dl_spi_remove(struct spi_device *spi)
@@ -87,6 +86,32 @@ static int __devexit lis302dl_spi_remove(struct spi_device *spi)
         return 0;
 }
 
+#ifdef CONFIG_PM
+static int lis3lv02d_spi_suspend(struct spi_device *spi, pm_message_t mesg)
+{
+        struct lis3lv02d *lis3 = spi_get_drvdata(spi);
+
+        if (!lis3->pdata->wakeup_flags)
+                lis3lv02d_poweroff(&lis3_dev);
+
+        return 0;
+}
+
+static int lis3lv02d_spi_resume(struct spi_device *spi)
+{
+        struct lis3lv02d *lis3 = spi_get_drvdata(spi);
+
+        if (!lis3->pdata->wakeup_flags)
+                lis3lv02d_poweron(lis3);
+
+        return 0;
+}
+
+#else
+#define lis3lv02d_spi_suspend   NULL
+#define lis3lv02d_spi_resume    NULL
+#endif
+
 static struct spi_driver lis302dl_spi_driver = {
         .driver  = {
                 .name   = DRV_NAME,
@@ -94,6 +119,8 @@ static struct spi_driver lis302dl_spi_driver = {
         },
         .probe  = lis302dl_spi_probe,
         .remove = __devexit_p(lis302dl_spi_remove),
+        .suspend = lis3lv02d_spi_suspend,
+        .resume  = lis3lv02d_spi_resume,
 };
 
 static int __init lis302dl_init(void)
diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
index 6290a259456e..303c02694c3c 100644
--- a/drivers/hwmon/sht15.c
+++ b/drivers/hwmon/sht15.c
@@ -562,7 +562,7 @@ static int __devinit sht15_probe(struct platform_device *pdev)
         ret = sysfs_create_group(&pdev->dev.kobj, &sht15_attr_group);
         if (ret) {
                 dev_err(&pdev->dev, "sysfs create failed");
-                goto err_free_data;
+                goto err_release_gpio_data;
         }
 
         ret = request_irq(gpio_to_irq(data->pdata->gpio_data),
@@ -581,10 +581,12 @@ static int __devinit sht15_probe(struct platform_device *pdev)
         data->hwmon_dev = hwmon_device_register(data->dev);
         if (IS_ERR(data->hwmon_dev)) {
                 ret = PTR_ERR(data->hwmon_dev);
-                goto err_release_gpio_data;
+                goto err_release_irq;
         }
         return 0;
 
+err_release_irq:
+        free_irq(gpio_to_irq(data->pdata->gpio_data), data);
 err_release_gpio_data:
         gpio_free(data->pdata->gpio_data);
 err_release_gpio_sck:
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index b79ca419d8d9..64207df8da82 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1686,7 +1686,7 @@ static int idecd_revalidate_disk(struct gendisk *disk)
         return  0;
 }
 
-static struct block_device_operations idecd_ops = {
+static const struct block_device_operations idecd_ops = {
         .owner                  = THIS_MODULE,
         .open                   = idecd_open,
         .release                = idecd_release,
diff --git a/drivers/ide/ide-gd.c b/drivers/ide/ide-gd.c
index 214119026b3f..753241429c26 100644
--- a/drivers/ide/ide-gd.c
+++ b/drivers/ide/ide-gd.c
@@ -321,7 +321,7 @@ static int ide_gd_ioctl(struct block_device *bdev, fmode_t mode,
         return drive->disk_ops->ioctl(drive, bdev, mode, cmd, arg);
 }
 
-static struct block_device_operations ide_gd_ops = {
+static const struct block_device_operations ide_gd_ops = {
         .owner                  = THIS_MODULE,
         .open                   = ide_gd_open,
         .release                = ide_gd_release,
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 8de442cbee94..63c53d65e875 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1212,7 +1212,7 @@ static int ide_find_port_slot(const struct ide_port_info *d)
 {
         int idx = -ENOENT;
         u8 bootable = (d && (d->host_flags & IDE_HFLAG_NON_BOOTABLE)) ? 0 : 1;
-        u8 i = (d && (d->host_flags & IDE_HFLAG_QD_2ND_PORT)) ? 1 : 0;;
+        u8 i = (d && (d->host_flags & IDE_HFLAG_QD_2ND_PORT)) ? 1 : 0;
 
         /*
          * Claim an unassigned slot.
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 9d6f62baac27..58fc920d5c32 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -1913,7 +1913,7 @@ static int idetape_ioctl(struct block_device *bdev, fmode_t mode,
         return err;
 }
 
-static struct block_device_operations idetape_block_ops = {
+static const struct block_device_operations idetape_block_ops = {
         .owner          = THIS_MODULE,
         .open           = idetape_open,
         .release        = idetape_release,
diff --git a/drivers/ide/umc8672.c b/drivers/ide/umc8672.c
index 0608d41fb6d0..60f936e2319c 100644
--- a/drivers/ide/umc8672.c
+++ b/drivers/ide/umc8672.c
@@ -170,9 +170,9 @@ static int __init umc8672_init(void)
                 goto out;
 
         if (umc8672_probe() == 0)
-                return 0;;
+                return 0;
 out:
-        return -ENODEV;;
+        return -ENODEV;
 }
 
 module_init(umc8672_init);
diff --git a/drivers/infiniband/hw/ipath/ipath_iba6110.c b/drivers/infiniband/hw/ipath/ipath_iba6110.c
index 02831ad070b8..4bd39c8af80f 100644
--- a/drivers/infiniband/hw/ipath/ipath_iba6110.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba6110.c
@@ -809,7 +809,7 @@ static int ipath_setup_ht_reset(struct ipath_devdata *dd)
  * errors.  We only bother to do this at load time, because it's OK if
  * it happened before we were loaded (first time after boot/reset),
  * but any time after that, it's fatal anyway.  Also need to not check
- * for for upper byte errors if we are in 8 bit mode, so figure out
+ * for upper byte errors if we are in 8 bit mode, so figure out
  * our width.  For now, at least, also complain if it's 8 bit.
  */
 static void slave_or_pri_blk(struct ipath_devdata *dd, struct pci_dev *pdev,
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index c9523e48c6ad..adb09e2ba394 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -229,7 +229,7 @@ struct atkbd {
 };
 
 /*
- * System-specific ketymap fixup routine
+ * System-specific keymap fixup routine
  */
 static void (*atkbd_platform_fixup)(struct atkbd *, const void *data);
 static void *atkbd_platform_fixup_data;
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 1a50be379cbc..76d6751f89a7 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -222,6 +222,22 @@ config INPUT_SGI_BTNS
           To compile this driver as a module, choose M here: the
           module will be called sgi_btns.
 
+config INPUT_WINBOND_CIR
+        tristate "Winbond IR remote control"
+        depends on X86 && PNP
+        select LEDS_CLASS
+        select BITREVERSE
+        help
+          Say Y here if you want to use the IR remote functionality found
+          in some Winbond SuperI/O chips. Currently only the WPCD376I
+          chip is supported (included in some Intel Media series motherboards).
+
+          IR Receive and wake-on-IR from suspend and power-off is currently
+          supported.
+
+          To compile this driver as a module, choose M here: the module will be
+          called winbond_cir.
+
 config HP_SDC_RTC
         tristate "HP SDC Real Time Clock"
         depends on (GSC || HP300) && SERIO
diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
index bf4db626c313..a8b84854fb7b 100644
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -26,6 +26,7 @@ obj-$(CONFIG_INPUT_SGI_BTNS)		+= sgi_btns.o
 obj-$(CONFIG_INPUT_SPARCSPKR)           += sparcspkr.o
 obj-$(CONFIG_INPUT_TWL4030_PWRBUTTON)   += twl4030-pwrbutton.o
 obj-$(CONFIG_INPUT_UINPUT)              += uinput.o
+obj-$(CONFIG_INPUT_WINBOND_CIR)         += winbond-cir.o
 obj-$(CONFIG_INPUT_WISTRON_BTNS)        += wistron_btns.o
 obj-$(CONFIG_INPUT_WM831X_ON)           += wm831x-on.o
 obj-$(CONFIG_INPUT_YEALINK)             += yealink.o
diff --git a/drivers/input/misc/winbond-cir.c b/drivers/input/misc/winbond-cir.c
new file mode 100644
index 000000000000..33309fe44e20
--- /dev/null
+++ b/drivers/input/misc/winbond-cir.c
@@ -0,0 +1,1614 @@
+/*
+ *  winbond-cir.c - Driver for the Consumer IR functionality of Winbond
+ *                  SuperI/O chips.
+ *
+ *  Currently supports the Winbond WPCD376i chip (PNP id WEC1022), but
+ *  could probably support others (Winbond WEC102X, NatSemi, etc)
+ *  with minor modifications.
+ *
+ *  Original Author: David Härdeman <david@hardeman.nu>
+ *     Copyright (C) 2009 David Härdeman <david@hardeman.nu>
+ *
+ *  Dedicated to Matilda, my newborn daughter, without whose loving attention
+ *  this driver would have been finished in half the time and with a fraction
+ *  of the bugs.
+ *
+ *  Written using:
+ *    o Winbond WPCD376I datasheet helpfully provided by Jesse Barnes at Intel
+ *    o NatSemi PC87338/PC97338 datasheet (for the serial port stuff)
+ *    o DSDT dumps
+ *
+ *  Supported features:
+ *    o RC6
+ *    o Wake-On-CIR functionality
+ *
+ *  To do:
+ *    o Test NEC and RC5
+ *
+ *  Left as an exercise for the reader:
+ *    o Learning (I have neither the hardware, nor the need)
+ *    o IR Transmit (ibid)
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/pnp.h>
+#include <linux/interrupt.h>
+#include <linux/timer.h>
+#include <linux/input.h>
+#include <linux/leds.h>
+#include <linux/list.h>
+#include <linux/spinlock.h>
+#include <linux/pci_ids.h>
+#include <linux/io.h>
+#include <linux/bitrev.h>
+#include <linux/bitops.h>
+
+#define DRVNAME "winbond-cir"
+
+/* CEIR Wake-Up Registers, relative to data->wbase                      */
+#define WBCIR_REG_WCEIR_CTL     0x03 /* CEIR Receiver Control           */
+#define WBCIR_REG_WCEIR_STS     0x04 /* CEIR Receiver Status            */
+#define WBCIR_REG_WCEIR_EV_EN   0x05 /* CEIR Receiver Event Enable      */
+#define WBCIR_REG_WCEIR_CNTL    0x06 /* CEIR Receiver Counter Low       */
+#define WBCIR_REG_WCEIR_CNTH    0x07 /* CEIR Receiver Counter High      */
+#define WBCIR_REG_WCEIR_INDEX   0x08 /* CEIR Receiver Index             */
+#define WBCIR_REG_WCEIR_DATA    0x09 /* CEIR Receiver Data              */
+#define WBCIR_REG_WCEIR_CSL     0x0A /* CEIR Re. Compare Strlen         */
+#define WBCIR_REG_WCEIR_CFG1    0x0B /* CEIR Re. Configuration 1        */
+#define WBCIR_REG_WCEIR_CFG2    0x0C /* CEIR Re. Configuration 2        */
+
+/* CEIR Enhanced Functionality Registers, relative to data->ebase       */
+#define WBCIR_REG_ECEIR_CTS     0x00 /* Enhanced IR Control Status      */
+#define WBCIR_REG_ECEIR_CCTL    0x01 /* Infrared Counter Control        */
+#define WBCIR_REG_ECEIR_CNT_LO  0x02 /* Infrared Counter LSB            */
+#define WBCIR_REG_ECEIR_CNT_HI  0x03 /* Infrared Counter MSB            */
+#define WBCIR_REG_ECEIR_IREM    0x04 /* Infrared Emitter Status         */
+
+/* SP3 Banked Registers, relative to data->sbase                        */
+#define WBCIR_REG_SP3_BSR       0x03 /* Bank Select, all banks          */
+                                      /* Bank 0                         */
+#define WBCIR_REG_SP3_RXDATA    0x00 /* FIFO RX data (r)                */
+#define WBCIR_REG_SP3_TXDATA    0x00 /* FIFO TX data (w)                */
+#define WBCIR_REG_SP3_IER       0x01 /* Interrupt Enable                */
+#define WBCIR_REG_SP3_EIR       0x02 /* Event Identification (r)        */
+#define WBCIR_REG_SP3_FCR       0x02 /* FIFO Control (w)                */
+#define WBCIR_REG_SP3_MCR       0x04 /* Mode Control                    */
+#define WBCIR_REG_SP3_LSR       0x05 /* Link Status                     */
+#define WBCIR_REG_SP3_MSR       0x06 /* Modem Status                    */
+#define WBCIR_REG_SP3_ASCR      0x07 /* Aux Status and Control          */
+                                      /* Bank 2                         */
+#define WBCIR_REG_SP3_BGDL      0x00 /* Baud Divisor LSB                */
+#define WBCIR_REG_SP3_BGDH      0x01 /* Baud Divisor MSB                */
+#define WBCIR_REG_SP3_EXCR1     0x02 /* Extended Control 1              */
+#define WBCIR_REG_SP3_EXCR2     0x04 /* Extended Control 2              */
+#define WBCIR_REG_SP3_TXFLV     0x06 /* TX FIFO Level                   */
+#define WBCIR_REG_SP3_RXFLV     0x07 /* RX FIFO Level                   */
+                                      /* Bank 3                         */
+#define WBCIR_REG_SP3_MRID      0x00 /* Module Identification           */
+#define WBCIR_REG_SP3_SH_LCR    0x01 /* LCR Shadow                      */
+#define WBCIR_REG_SP3_SH_FCR    0x02 /* FCR Shadow                      */
+                                      /* Bank 4                         */
+#define WBCIR_REG_SP3_IRCR1     0x02 /* Infrared Control 1              */
+                                      /* Bank 5                         */
+#define WBCIR_REG_SP3_IRCR2     0x04 /* Infrared Control 2              */
+                                      /* Bank 6                         */
+#define WBCIR_REG_SP3_IRCR3     0x00 /* Infrared Control 3              */
+#define WBCIR_REG_SP3_SIR_PW    0x02 /* SIR Pulse Width         */
+                                      /* Bank 7                         */
+#define WBCIR_REG_SP3_IRRXDC    0x00 /* IR RX Demod Control             */
+#define WBCIR_REG_SP3_IRTXMC    0x01 /* IR TX Mod Control               */
+#define WBCIR_REG_SP3_RCCFG     0x02 /* CEIR Config                     */
+#define WBCIR_REG_SP3_IRCFG1    0x04 /* Infrared Config 1               */
+#define WBCIR_REG_SP3_IRCFG4    0x07 /* Infrared Config 4               */
+
+/*
+ * Magic values follow
+ */
+
+/* No interrupts for WBCIR_REG_SP3_IER and WBCIR_REG_SP3_EIR */
+#define WBCIR_IRQ_NONE          0x00
+/* RX data bit for WBCIR_REG_SP3_IER and WBCIR_REG_SP3_EIR */
+#define WBCIR_IRQ_RX            0x01
+/* Over/Under-flow bit for WBCIR_REG_SP3_IER and WBCIR_REG_SP3_EIR */
+#define WBCIR_IRQ_ERR           0x04
+/* Led enable/disable bit for WBCIR_REG_ECEIR_CTS */
+#define WBCIR_LED_ENABLE        0x80
+/* RX data available bit for WBCIR_REG_SP3_LSR */
+#define WBCIR_RX_AVAIL          0x01
+/* RX disable bit for WBCIR_REG_SP3_ASCR */
+#define WBCIR_RX_DISABLE        0x20
+/* Extended mode enable bit for WBCIR_REG_SP3_EXCR1 */
+#define WBCIR_EXT_ENABLE        0x01
+/* Select compare register in WBCIR_REG_WCEIR_INDEX (bits 5 & 6) */
+#define WBCIR_REGSEL_COMPARE    0x10
+/* Select mask register in WBCIR_REG_WCEIR_INDEX (bits 5 & 6) */
+#define WBCIR_REGSEL_MASK       0x20
+/* Starting address of selected register in WBCIR_REG_WCEIR_INDEX */
+#define WBCIR_REG_ADDR0         0x00
+
+/* Valid banks for the SP3 UART */
+enum wbcir_bank {
+        WBCIR_BANK_0          = 0x00,
+        WBCIR_BANK_1          = 0x80,
+        WBCIR_BANK_2          = 0xE0,
+        WBCIR_BANK_3          = 0xE4,
+        WBCIR_BANK_4          = 0xE8,
+        WBCIR_BANK_5          = 0xEC,
+        WBCIR_BANK_6          = 0xF0,
+        WBCIR_BANK_7          = 0xF4,
+};
+
+/* Supported IR Protocols */
+enum wbcir_protocol {
+        IR_PROTOCOL_RC5          = 0x0,
+        IR_PROTOCOL_NEC          = 0x1,
+        IR_PROTOCOL_RC6          = 0x2,
+};
+
+/* Misc */
+#define WBCIR_NAME      "Winbond CIR"
+#define WBCIR_ID_FAMILY          0xF1 /* Family ID for the WPCD376I     */
+#define WBCIR_ID_CHIP            0x04 /* Chip ID for the WPCD376I       */
+#define IR_KEYPRESS_TIMEOUT       250 /* FIXME: should be per-protocol? */
+#define INVALID_SCANCODE   0x7FFFFFFF /* Invalid with all protos        */
+#define WAKEUP_IOMEM_LEN         0x10 /* Wake-Up I/O Reg Len            */
+#define EHFUNC_IOMEM_LEN         0x10 /* Enhanced Func I/O Reg Len      */
+#define SP_IOMEM_LEN             0x08 /* Serial Port 3 (IR) Reg Len     */
+#define WBCIR_MAX_IDLE_BYTES       10
+
+static DEFINE_SPINLOCK(wbcir_lock);
+static DEFINE_RWLOCK(keytable_lock);
+
+struct wbcir_key {
+        u32 scancode;
+        unsigned int keycode;
+};
+
+struct wbcir_keyentry {
+        struct wbcir_key key;
+        struct list_head list;
+};
+
+static struct wbcir_key rc6_def_keymap[] = {
+        { 0x800F0400, KEY_NUMERIC_0             },
+        { 0x800F0401, KEY_NUMERIC_1             },
+        { 0x800F0402, KEY_NUMERIC_2             },
+        { 0x800F0403, KEY_NUMERIC_3             },
+        { 0x800F0404, KEY_NUMERIC_4             },
+        { 0x800F0405, KEY_NUMERIC_5             },
+        { 0x800F0406, KEY_NUMERIC_6             },
+        { 0x800F0407, KEY_NUMERIC_7             },
+        { 0x800F0408, KEY_NUMERIC_8             },
+        { 0x800F0409, KEY_NUMERIC_9             },
+        { 0x800F041D, KEY_NUMERIC_STAR          },
+        { 0x800F041C, KEY_NUMERIC_POUND         },
+        { 0x800F0410, KEY_VOLUMEUP              },
+        { 0x800F0411, KEY_VOLUMEDOWN            },
+        { 0x800F0412, KEY_CHANNELUP             },
+        { 0x800F0413, KEY_CHANNELDOWN           },
+        { 0x800F040E, KEY_MUTE                  },
+        { 0x800F040D, KEY_VENDOR                }, /* Vista Logo Key */
+        { 0x800F041E, KEY_UP                    },
+        { 0x800F041F, KEY_DOWN                  },
+        { 0x800F0420, KEY_LEFT                  },
+        { 0x800F0421, KEY_RIGHT                 },
+        { 0x800F0422, KEY_OK                    },
+        { 0x800F0423, KEY_ESC                   },
+        { 0x800F040F, KEY_INFO                  },
+        { 0x800F040A, KEY_CLEAR                 },
+        { 0x800F040B, KEY_ENTER                 },
+        { 0x800F045B, KEY_RED                   },
+        { 0x800F045C, KEY_GREEN                 },
+        { 0x800F045D, KEY_YELLOW                },
+        { 0x800F045E, KEY_BLUE                  },
+        { 0x800F045A, KEY_TEXT                  },
+        { 0x800F0427, KEY_SWITCHVIDEOMODE       },
+        { 0x800F040C, KEY_POWER                 },
+        { 0x800F0450, KEY_RADIO                 },
+        { 0x800F0448, KEY_PVR                   },
+        { 0x800F0447, KEY_AUDIO                 },
+        { 0x800F0426, KEY_EPG                   },
+        { 0x800F0449, KEY_CAMERA                },
+        { 0x800F0425, KEY_TV                    },
+        { 0x800F044A, KEY_VIDEO                 },
+        { 0x800F0424, KEY_DVD                   },
+        { 0x800F0416, KEY_PLAY                  },
+        { 0x800F0418, KEY_PAUSE                 },
+        { 0x800F0419, KEY_STOP                  },
+        { 0x800F0414, KEY_FASTFORWARD           },
+        { 0x800F041A, KEY_NEXT                  },
+        { 0x800F041B, KEY_PREVIOUS              },
+        { 0x800F0415, KEY_REWIND                },
+        { 0x800F0417, KEY_RECORD                },
+};
+
+/* Registers and other state is protected by wbcir_lock */
+struct wbcir_data {
+        unsigned long wbase;        /* Wake-Up Baseaddr         */
+        unsigned long ebase;        /* Enhanced Func. Baseaddr  */
+        unsigned long sbase;        /* Serial Port Baseaddr     */
+        unsigned int  irq;          /* Serial Port IRQ          */
+
+        struct input_dev *input_dev;
+        struct timer_list timer_keyup;
+        struct led_trigger *rxtrigger;
+        struct led_trigger *txtrigger;
+        struct led_classdev led;
+
+        u32 last_scancode;
+        unsigned int last_keycode;
+        u8 last_toggle;
+        u8 keypressed;
+        unsigned long keyup_jiffies;
+        unsigned int idle_count;
+
+        /* RX irdata and parsing state */
+        unsigned long irdata[30];
+        unsigned int irdata_count;
+        unsigned int irdata_idle;
+        unsigned int irdata_off;
+        unsigned int irdata_error;
+
+        /* Protected by keytable_lock */
+        struct list_head keytable;
+};
+
+static enum wbcir_protocol protocol = IR_PROTOCOL_RC6;
+module_param(protocol, uint, 0444);
+MODULE_PARM_DESC(protocol, "IR protocol to use "
+                 "(0 = RC5, 1 = NEC, 2 = RC6A, default)");
+
+static int invert; /* default = 0 */
+module_param(invert, bool, 0444);
+MODULE_PARM_DESC(invert, "Invert the signal from the IR receiver");
+
+static unsigned int wake_sc = 0x800F040C;
+module_param(wake_sc, uint, 0644);
+MODULE_PARM_DESC(wake_sc, "Scancode of the power-on IR command");
+
+static unsigned int wake_rc6mode = 6;
+module_param(wake_rc6mode, uint, 0644);
+MODULE_PARM_DESC(wake_rc6mode, "RC6 mode for the power-on command "
+                 "(0 = 0, 6 = 6A, default)");
+
+
+
+/*****************************************************************************
+ *
+ * UTILITY FUNCTIONS
+ *
+ *****************************************************************************/
+
+/* Caller needs to hold wbcir_lock */
+static void
+wbcir_set_bits(unsigned long addr, u8 bits, u8 mask)
+{
+        u8 val;
+
+        val = inb(addr);
+        val = ((val & ~mask) | (bits & mask));
+        outb(val, addr);
+}
+
+/* Selects the register bank for the serial port */
+static inline void
+wbcir_select_bank(struct wbcir_data *data, enum wbcir_bank bank)
+{
+        outb(bank, data->sbase + WBCIR_REG_SP3_BSR);
+}
+
+static enum led_brightness
+wbcir_led_brightness_get(struct led_classdev *led_cdev)
+{
+        struct wbcir_data *data = container_of(led_cdev,
+                                               struct wbcir_data,
+                                               led);
+
+        if (inb(data->ebase + WBCIR_REG_ECEIR_CTS) & WBCIR_LED_ENABLE)
+                return LED_FULL;
+        else
+                return LED_OFF;
+}
+
+static void
+wbcir_led_brightness_set(struct led_classdev *led_cdev,
+                            enum led_brightness brightness)
+{
+        struct wbcir_data *data = container_of(led_cdev,
+                                               struct wbcir_data,
+                                               led);
+
+        wbcir_set_bits(data->ebase + WBCIR_REG_ECEIR_CTS,
+                       brightness == LED_OFF ? 0x00 : WBCIR_LED_ENABLE,
+                       WBCIR_LED_ENABLE);
+}
+
+/* Manchester encodes bits to RC6 message cells (see wbcir_parse_rc6) */
+static u8
+wbcir_to_rc6cells(u8 val)
+{
+        u8 coded = 0x00;
+        int i;
+
+        val &= 0x0F;
+        for (i = 0; i < 4; i++) {
+                if (val & 0x01)
+                        coded |= 0x02 << (i * 2);
+                else
+                        coded |= 0x01 << (i * 2);
+                val >>= 1;
+        }
+
+        return coded;
+}
+
+
+
+/*****************************************************************************
+ *
+ * INPUT FUNCTIONS
+ *
+ *****************************************************************************/
+
+static unsigned int
+wbcir_do_getkeycode(struct wbcir_data *data, u32 scancode)
+{
+        struct wbcir_keyentry *keyentry;
+        unsigned int keycode = KEY_RESERVED;
+        unsigned long flags;
+
+        read_lock_irqsave(&keytable_lock, flags);
+
+        list_for_each_entry(keyentry, &data->keytable, list) {
+                if (keyentry->key.scancode == scancode) {
+                        keycode = keyentry->key.keycode;
+                        break;
+                }
+        }
+
+        read_unlock_irqrestore(&keytable_lock, flags);
+        return keycode;
+}
+
+static int
+wbcir_getkeycode(struct input_dev *dev, int scancode, int *keycode)
+{
+        struct wbcir_data *data = input_get_drvdata(dev);
+
+        *keycode = (int)wbcir_do_getkeycode(data, (u32)scancode);
+        return 0;
+}
+
+static int
+wbcir_setkeycode(struct input_dev *dev, int sscancode, int keycode)
+{
+        struct wbcir_data *data = input_get_drvdata(dev);
+        struct wbcir_keyentry *keyentry;
+        struct wbcir_keyentry *new_keyentry;
+        unsigned long flags;
+        unsigned int old_keycode = KEY_RESERVED;
+        u32 scancode = (u32)sscancode;
+
+        if (keycode < 0 || keycode > KEY_MAX)
+                return -EINVAL;
+
+        new_keyentry = kmalloc(sizeof(*new_keyentry), GFP_KERNEL);
+        if (!new_keyentry)
+                return -ENOMEM;
+
+        write_lock_irqsave(&keytable_lock, flags);
+
+        list_for_each_entry(keyentry, &data->keytable, list) {
+                if (keyentry->key.scancode != scancode)
+                        continue;
+
+                old_keycode = keyentry->key.keycode;
+                keyentry->key.keycode = keycode;
+
+                if (keyentry->key.keycode == KEY_RESERVED) {
+                        list_del(&keyentry->list);
+                        kfree(keyentry);
+                }
+
+                break;
+        }
+
+        set_bit(keycode, dev->keybit);
+
+        if (old_keycode == KEY_RESERVED) {
+                new_keyentry->key.scancode = scancode;
+                new_keyentry->key.keycode = keycode;
+                list_add(&new_keyentry->list, &data->keytable);
+        } else {
+                kfree(new_keyentry);
+                clear_bit(old_keycode, dev->keybit);
+                list_for_each_entry(keyentry, &data->keytable, list) {
+                        if (keyentry->key.keycode == old_keycode) {
+                                set_bit(old_keycode, dev->keybit);
+                                break;
+                        }
+                }
+        }
+
+        write_unlock_irqrestore(&keytable_lock, flags);
+        return 0;
+}
+
+/*
+ * Timer function to report keyup event some time after keydown is
+ * reported by the ISR.
+ */
+static void
+wbcir_keyup(unsigned long cookie)
+{
+        struct wbcir_data *data = (struct wbcir_data *)cookie;
+        unsigned long flags;
+
+        /*
+         * data->keyup_jiffies is used to prevent a race condition if a
+         * hardware interrupt occurs at this point and the keyup timer
+         * event is moved further into the future as a result.
+         *
+         * The timer will then be reactivated and this function called
+         * again in the future. We need to exit gracefully in that case
+         * to allow the input subsystem to do its auto-repeat magic or
+         * a keyup event might follow immediately after the keydown.
+         */
+
+        spin_lock_irqsave(&wbcir_lock, flags);
+
+        if (time_is_after_eq_jiffies(data->keyup_jiffies) && data->keypressed) {
+                data->keypressed = 0;
+                led_trigger_event(data->rxtrigger, LED_OFF);
+                input_report_key(data->input_dev, data->last_keycode, 0);
+                input_sync(data->input_dev);
+        }
+
+        spin_unlock_irqrestore(&wbcir_lock, flags);
+}
+
+static void
+wbcir_keydown(struct wbcir_data *data, u32 scancode, u8 toggle)
+{
+        unsigned int keycode;
+
+        /* Repeat? */
+        if (data->last_scancode == scancode &&
+            data->last_toggle == toggle &&
+            data->keypressed)
+                goto set_timer;
+        data->last_scancode = scancode;
+
+        /* Do we need to release an old keypress? */
+        if (data->keypressed) {
+                input_report_key(data->input_dev, data->last_keycode, 0);
+                input_sync(data->input_dev);
+                data->keypressed = 0;
+        }
+
+        /* Report scancode */
+        input_event(data->input_dev, EV_MSC, MSC_SCAN, (int)scancode);
+
+        /* Do we know this scancode? */
+        keycode = wbcir_do_getkeycode(data, scancode);
+        if (keycode == KEY_RESERVED)
+                goto set_timer;
+
+        /* Register a keypress */
+        input_report_key(data->input_dev, keycode, 1);
+        data->keypressed = 1;
+        data->last_keycode = keycode;
+        data->last_toggle = toggle;
+
+set_timer:
+        input_sync(data->input_dev);
+        led_trigger_event(data->rxtrigger,
+                          data->keypressed ? LED_FULL : LED_OFF);
+        data->keyup_jiffies = jiffies + msecs_to_jiffies(IR_KEYPRESS_TIMEOUT);
+        mod_timer(&data->timer_keyup, data->keyup_jiffies);
+}
+
+
+
+/*****************************************************************************
+ *
+ * IR PARSING FUNCTIONS
+ *
+ *****************************************************************************/
+
+/* Resets all irdata */
+static void
+wbcir_reset_irdata(struct wbcir_data *data)
+{
+        memset(data->irdata, 0, sizeof(data->irdata));
+        data->irdata_count = 0;
+        data->irdata_off = 0;
+        data->irdata_error = 0;
+}
+
+/* Adds one bit of irdata */
+static void
+add_irdata_bit(struct wbcir_data *data, int set)
+{
+        if (data->irdata_count >= sizeof(data->irdata) * 8) {
+                data->irdata_error = 1;
+                return;
+        }
+
+        if (set)
+                __set_bit(data->irdata_count, data->irdata);
+        data->irdata_count++;
+}
+
+/* Gets count bits of irdata */
+static u16
+get_bits(struct wbcir_data *data, int count)
+{
+        u16 val = 0x0;
+
+        if (data->irdata_count - data->irdata_off < count) {
+                data->irdata_error = 1;
+                return 0x0;
+        }
+
+        while (count > 0) {
+                val <<= 1;
+                if (test_bit(data->irdata_off, data->irdata))
+                        val |= 0x1;
+                count--;
+                data->irdata_off++;
+        }
+
+        return val;
+}
+
+/* Reads 16 cells and converts them to a byte */
+static u8
+wbcir_rc6cells_to_byte(struct wbcir_data *data)
+{
+        u16 raw = get_bits(data, 16);
+        u8 val = 0x00;
+        int bit;
+
+        for (bit = 0; bit < 8; bit++) {
+                switch (raw & 0x03) {
+                case 0x01:
+                        break;
+                case 0x02:
+                        val |= (0x01 << bit);
+                        break;
+                default:
+                        data->irdata_error = 1;
+                        break;
+                }
+                raw >>= 2;
+        }
+
+        return val;
+}
+
+/* Decodes a number of bits from raw RC5 data */
+static u8
+wbcir_get_rc5bits(struct wbcir_data *data, unsigned int count)
+{
+        u16 raw = get_bits(data, count * 2);
+        u8 val = 0x00;
+        int bit;
+
+        for (bit = 0; bit < count; bit++) {
+                switch (raw & 0x03) {
+                case 0x01:
+                        val |= (0x01 << bit);
+                        break;
+                case 0x02:
+                        break;
+                default:
+                        data->irdata_error = 1;
+                        break;
+                }
+                raw >>= 2;
+        }
+
+        return val;
+}
+
+static void
+wbcir_parse_rc6(struct device *dev, struct wbcir_data *data)
+{
+        /*
+         * Normal bits are manchester coded as follows:
+         * cell0 + cell1 = logic "0"
+         * cell1 + cell0 = logic "1"
+         *
+         * The IR pulse has the following components:
+         *
+         * Leader               - 6 * cell1 - discarded
+         * Gap                  - 2 * cell0 - discarded
+         * Start bit            - Normal Coding - always "1"
+         * Mode Bit 2 - 0       - Normal Coding
+         * Toggle bit           - Normal Coding with double bit time,
+         *                        e.g. cell0 + cell0 + cell1 + cell1
+         *                        means logic "0".
+         *
+         * The rest depends on the mode, the following modes are known:
+         *
+         * MODE 0:
+         *  Address Bit 7 - 0   - Normal Coding
+         *  Command Bit 7 - 0   - Normal Coding
+         *
+         * MODE 6:
+         *  The above Toggle Bit is used as a submode bit, 0 = A, 1 = B.
+         *  Submode B is for pointing devices, only remotes using submode A
+         *  are supported.
+         *
+         *  Customer range bit  - 0 => Customer = 7 bits, 0...127
+         *                        1 => Customer = 15 bits, 32768...65535
+         *  Customer Bits       - Normal Coding
+         *
+         *  Customer codes are allocated by Philips. The rest of the bits
+         *  are customer dependent. The following is commonly used (and the
+         *  only supported config):
+         *
+         *  Toggle Bit          - Normal Coding
+         *  Address Bit 6 - 0   - Normal Coding
+         *  Command Bit 7 - 0   - Normal Coding
+         *
+         * All modes are followed by at least 6 * cell0.
+         *
+         * MODE 0 msglen:
+         *  1 * 2 (start bit) + 3 * 2 (mode) + 2 * 2 (toggle) +
+         *  8 * 2 (address) + 8 * 2 (command) =
+         *  44 cells
+         *
+         * MODE 6A msglen:
+         *  1 * 2 (start bit) + 3 * 2 (mode) + 2 * 2 (submode) +
+         *  1 * 2 (customer range bit) + 7/15 * 2 (customer bits) +
+         *  1 * 2 (toggle bit) + 7 * 2 (address) + 8 * 2 (command) =
+         *  60 - 76 cells
+         */
+        u8 mode;
+        u8 toggle;
+        u16 customer = 0x0;
+        u8 address;
+        u8 command;
+        u32 scancode;
+
+        /* Leader mark */
+        while (get_bits(data, 1) && !data->irdata_error)
+                /* Do nothing */;
+
+        /* Leader space */
+        if (get_bits(data, 1)) {
+                dev_dbg(dev, "RC6 - Invalid leader space\n");
+                return;
+        }
+
+        /* Start bit */
+        if (get_bits(data, 2) != 0x02) {
+                dev_dbg(dev, "RC6 - Invalid start bit\n");
+                return;
+        }
+
+        /* Mode */
+        mode = get_bits(data, 6);
+        switch (mode) {
+        case 0x15: /* 010101 = b000 */
+                mode = 0;
+                break;
+        case 0x29: /* 101001 = b110 */
+                mode = 6;
+                break;
+        default:
+                dev_dbg(dev, "RC6 - Invalid mode\n");
+                return;
+        }
+
+        /* Toggle bit / Submode bit */
+        toggle = get_bits(data, 4);
+        switch (toggle) {
+        case 0x03:
+                toggle = 0;
+                break;
+        case 0x0C:
+                toggle = 1;
+                break;
+        default:
+                dev_dbg(dev, "RC6 - Toggle bit error\n");
+                break;
+        }
+
+        /* Customer */
+        if (mode == 6) {
+                if (toggle != 0) {
+                        dev_dbg(dev, "RC6B - Not Supported\n");
+                        return;
+                }
+
+                customer = wbcir_rc6cells_to_byte(data);
+
+                if (customer & 0x80) {
+                        /* 15 bit customer value */
+                        customer <<= 8;
+                        customer |= wbcir_rc6cells_to_byte(data);
+                }
+        }
+
+        /* Address */
+        address = wbcir_rc6cells_to_byte(data);
+        if (mode == 6) {
+                toggle = address >> 7;
+                address &= 0x7F;
+        }
+
+        /* Command */
+        command = wbcir_rc6cells_to_byte(data);
+
+        /* Create scancode */
+        scancode =  command;
+        scancode |= address << 8;
+        scancode |= customer << 16;
+
+        /* Last sanity check */
+        if (data->irdata_error) {
+                dev_dbg(dev, "RC6 - Cell error(s)\n");
+                return;
+        }
+
+        dev_info(dev, "IR-RC6 ad 0x%02X cm 0x%02X cu 0x%04X "
+                "toggle %u mode %u scan 0x%08X\n",
+                address,
+                command,
+                customer,
+                (unsigned int)toggle,
+                (unsigned int)mode,
+                scancode);
+
+        wbcir_keydown(data, scancode, toggle);
+}
+
+static void
+wbcir_parse_rc5(struct device *dev, struct wbcir_data *data)
+{
+        /*
+         * Bits are manchester coded as follows:
+         * cell1 + cell0 = logic "0"
+         * cell0 + cell1 = logic "1"
+         * (i.e. the reverse of RC6)
+         *
+         * Start bit 1          - "1" - discarded
+         * Start bit 2          - Must be inverted to get command bit 6
+         * Toggle bit
+         * Address Bit 4 - 0
+         * Command Bit 5 - 0
+         */
+        u8 toggle;
+        u8 address;
+        u8 command;
+        u32 scancode;
+
+        /* Start bit 1 */
+        if (!get_bits(data, 1)) {
+                dev_dbg(dev, "RC5 - Invalid start bit\n");
+                return;
+        }
+
+        /* Start bit 2 */
+        if (!wbcir_get_rc5bits(data, 1))
+                command = 0x40;
+        else
+                command = 0x00;
+
+        toggle   = wbcir_get_rc5bits(data, 1);
+        address  = wbcir_get_rc5bits(data, 5);
+        command |= wbcir_get_rc5bits(data, 6);
+        scancode = address << 7 | command;
+
+        /* Last sanity check */
+        if (data->irdata_error) {
+                dev_dbg(dev, "RC5 - Invalid message\n");
+                return;
+        }
+
+        dev_dbg(dev, "IR-RC5 ad %u cm %u t %u s %u\n",
+                (unsigned int)address,
+                (unsigned int)command,
+                (unsigned int)toggle,
+                (unsigned int)scancode);
+
+        wbcir_keydown(data, scancode, toggle);
+}
+
+static void
+wbcir_parse_nec(struct device *dev, struct wbcir_data *data)
+{
+        /*
+         * Each bit represents 560 us.
+         *
+         * Leader               - 9 ms burst
+         * Gap                  - 4.5 ms silence
+         * Address1 bit 0 - 7   - Address 1
+         * Address2 bit 0 - 7   - Address 2
+         * Command1 bit 0 - 7   - Command 1
+         * Command2 bit 0 - 7   - Command 2
+         *
+         * Note the bit order!
+         *
+         * With the old NEC protocol, Address2 was the inverse of Address1
+         * and Command2 was the inverse of Command1 and were used as
+         * an error check.
+         *
+         * With NEC extended, Address1 is the LSB of the Address and
+         * Address2 is the MSB, Command parsing remains unchanged.
+         *
+         * A repeat message is coded as:
+         * Leader               - 9 ms burst
+         * Gap                  - 2.25 ms silence
+         * Repeat               - 560 us active
+         */
+        u8 address1;
+        u8 address2;
+        u8 command1;
+        u8 command2;
+        u16 address;
+        u32 scancode;
+
+        /* Leader mark */
+        while (get_bits(data, 1) && !data->irdata_error)
+                /* Do nothing */;
+
+        /* Leader space */
+        if (get_bits(data, 4)) {
+                dev_dbg(dev, "NEC - Invalid leader space\n");
+                return;
+        }
+
+        /* Repeat? */
+        if (get_bits(data, 1)) {
+                if (!data->keypressed) {
+                        dev_dbg(dev, "NEC - Stray repeat message\n");
+                        return;
+                }
+
+                dev_dbg(dev, "IR-NEC repeat s %u\n",
+                        (unsigned int)data->last_scancode);
+
+                wbcir_keydown(data, data->last_scancode, data->last_toggle);
+                return;
+        }
+
+        /* Remaining leader space */
+        if (get_bits(data, 3)) {
+                dev_dbg(dev, "NEC - Invalid leader space\n");
+                return;
+        }
+
+        address1  = bitrev8(get_bits(data, 8));
+        address2  = bitrev8(get_bits(data, 8));
+        command1  = bitrev8(get_bits(data, 8));
+        command2  = bitrev8(get_bits(data, 8));
+
+        /* Sanity check */
+        if (data->irdata_error) {
+                dev_dbg(dev, "NEC - Invalid message\n");
+                return;
+        }
+
+        /* Check command validity */
+        if (command1 != ~command2) {
+                dev_dbg(dev, "NEC - Command bytes mismatch\n");
+                return;
+        }
+
+        /* Check for extended NEC protocol */
+        address = address1;
+        if (address1 != ~address2)
+                address |= address2 << 8;
+
+        scancode = address << 8 | command1;
+
+        dev_dbg(dev, "IR-NEC ad %u cm %u s %u\n",
+                (unsigned int)address,
+                (unsigned int)command1,
+                (unsigned int)scancode);
+
+        wbcir_keydown(data, scancode, !data->last_toggle);
+}
+
+
+
+/*****************************************************************************
+ *
+ * INTERRUPT FUNCTIONS
+ *
+ *****************************************************************************/
+
+static irqreturn_t
+wbcir_irq_handler(int irqno, void *cookie)
+{
+        struct pnp_dev *device = cookie;
+        struct wbcir_data *data = pnp_get_drvdata(device);
+        struct device *dev = &device->dev;
+        u8 status;
+        unsigned long flags;
+        u8 irdata[8];
+        int i;
+        unsigned int hw;
+
+        spin_lock_irqsave(&wbcir_lock, flags);
+
+        wbcir_select_bank(data, WBCIR_BANK_0);
+
+        status = inb(data->sbase + WBCIR_REG_SP3_EIR);
+
+        if (!(status & (WBCIR_IRQ_RX | WBCIR_IRQ_ERR))) {
+                spin_unlock_irqrestore(&wbcir_lock, flags);
+                return IRQ_NONE;
+        }
+
+        if (status & WBCIR_IRQ_ERR)
+                data->irdata_error = 1;
+
+        if (!(status & WBCIR_IRQ_RX))
+                goto out;
+
+        /* Since RXHDLEV is set, at least 8 bytes are in the FIFO */
+        insb(data->sbase + WBCIR_REG_SP3_RXDATA, &irdata[0], 8);
+
+        for (i = 0; i < sizeof(irdata); i++) {
+                hw = hweight8(irdata[i]);
+                if (hw > 4)
+                        add_irdata_bit(data, 0);
+                else
+                        add_irdata_bit(data, 1);
+
+                if (hw == 8)
+                        data->idle_count++;
+                else
+                        data->idle_count = 0;
+        }
+
+        if (data->idle_count > WBCIR_MAX_IDLE_BYTES) {
+                /* Set RXINACTIVE... */
+                outb(WBCIR_RX_DISABLE, data->sbase + WBCIR_REG_SP3_ASCR);
+
+                /* ...and drain the FIFO */
+                while (inb(data->sbase + WBCIR_REG_SP3_LSR) & WBCIR_RX_AVAIL)
+                        inb(data->sbase + WBCIR_REG_SP3_RXDATA);
+
+                dev_dbg(dev, "IRDATA:\n");
+                for (i = 0; i < data->irdata_count; i += BITS_PER_LONG)
+                        dev_dbg(dev, "0x%08lX\n", data->irdata[i/BITS_PER_LONG]);
+
+                switch (protocol) {
+                case IR_PROTOCOL_RC5:
+                        wbcir_parse_rc5(dev, data);
+                        break;
+                case IR_PROTOCOL_RC6:
+                        wbcir_parse_rc6(dev, data);
+                        break;
+                case IR_PROTOCOL_NEC:
+                        wbcir_parse_nec(dev, data);
+                        break;
+                }
+
+                wbcir_reset_irdata(data);
+                data->idle_count = 0;
+        }
+
+out:
+        spin_unlock_irqrestore(&wbcir_lock, flags);
+        return IRQ_HANDLED;
+}
+
+
+
+/*****************************************************************************
+ *
+ * SUSPEND/RESUME FUNCTIONS
+ *
+ *****************************************************************************/
+
+static void
+wbcir_shutdown(struct pnp_dev *device)
+{
+        struct device *dev = &device->dev;
+        struct wbcir_data *data = pnp_get_drvdata(device);
+        int do_wake = 1;
+        u8 match[11];
+        u8 mask[11];
+        u8 rc6_csl = 0;
+        int i;
+
+        memset(match, 0, sizeof(match));
+        memset(mask, 0, sizeof(mask));
+
+        if (wake_sc == INVALID_SCANCODE || !device_may_wakeup(dev)) {
+                do_wake = 0;
+                goto finish;
+        }
+
+        switch (protocol) {
+        case IR_PROTOCOL_RC5:
+                if (wake_sc > 0xFFF) {
+                        do_wake = 0;
+                        dev_err(dev, "RC5 - Invalid wake scancode\n");
+                        break;
+                }
+
+                /* Mask = 13 bits, ex toggle */
+                mask[0] = 0xFF;
+                mask[1] = 0x17;
+
+                match[0]  = (wake_sc & 0x003F);      /* 6 command bits */
+                match[0] |= (wake_sc & 0x0180) >> 1; /* 2 address bits */
+                match[1]  = (wake_sc & 0x0E00) >> 9; /* 3 address bits */
+                if (!(wake_sc & 0x0040))             /* 2nd start bit  */
+                        match[1] |= 0x10;
+
+                break;
+
+        case IR_PROTOCOL_NEC:
+                if (wake_sc > 0xFFFFFF) {
+                        do_wake = 0;
+                        dev_err(dev, "NEC - Invalid wake scancode\n");
+                        break;
+                }
+
+                mask[0] = mask[1] = mask[2] = mask[3] = 0xFF;
+
+                match[1] = bitrev8((wake_sc & 0xFF));
+                match[0] = ~match[1];
+
+                match[3] = bitrev8((wake_sc & 0xFF00) >> 8);
+                if (wake_sc > 0xFFFF)
+                        match[2] = bitrev8((wake_sc & 0xFF0000) >> 16);
+                else
+                        match[2] = ~match[3];
+
+                break;
+
+        case IR_PROTOCOL_RC6:
+
+                if (wake_rc6mode == 0) {
+                        if (wake_sc > 0xFFFF) {
+                                do_wake = 0;
+                                dev_err(dev, "RC6 - Invalid wake scancode\n");
+                                break;
+                        }
+
+                        /* Command */
+                        match[0] = wbcir_to_rc6cells(wake_sc >>  0);
+                        mask[0]  = 0xFF;
+                        match[1] = wbcir_to_rc6cells(wake_sc >>  4);
+                        mask[1]  = 0xFF;
+
+                        /* Address */
+                        match[2] = wbcir_to_rc6cells(wake_sc >>  8);
+                        mask[2]  = 0xFF;
+                        match[3] = wbcir_to_rc6cells(wake_sc >> 12);
+                        mask[3]  = 0xFF;
+
+                        /* Header */
+                        match[4] = 0x50; /* mode1 = mode0 = 0, ignore toggle */
+                        mask[4]  = 0xF0;
+                        match[5] = 0x09; /* start bit = 1, mode2 = 0 */
+                        mask[5]  = 0x0F;
+
+                        rc6_csl = 44;
+
+                } else if (wake_rc6mode == 6) {
+                        i = 0;
+
+                        /* Command */
+                        match[i]  = wbcir_to_rc6cells(wake_sc >>  0);
+                        mask[i++] = 0xFF;
+                        match[i]  = wbcir_to_rc6cells(wake_sc >>  4);
+                        mask[i++] = 0xFF;
+
+                        /* Address + Toggle */
+                        match[i]  = wbcir_to_rc6cells(wake_sc >>  8);
+                        mask[i++] = 0xFF;
+                        match[i]  = wbcir_to_rc6cells(wake_sc >> 12);
+                        mask[i++] = 0x3F;
+
+                        /* Customer bits 7 - 0 */
+                        match[i]  = wbcir_to_rc6cells(wake_sc >> 16);
+                        mask[i++] = 0xFF;
+                        match[i]  = wbcir_to_rc6cells(wake_sc >> 20);
+                        mask[i++] = 0xFF;
+
+                        if (wake_sc & 0x80000000) {
+                                /* Customer range bit and bits 15 - 8 */
+                                match[i]  = wbcir_to_rc6cells(wake_sc >> 24);
+                                mask[i++] = 0xFF;
+                                match[i]  = wbcir_to_rc6cells(wake_sc >> 28);
+                                mask[i++] = 0xFF;
+                                rc6_csl = 76;
+                        } else if (wake_sc <= 0x007FFFFF) {
+                                rc6_csl = 60;
+                        } else {
+                                do_wake = 0;
+                                dev_err(dev, "RC6 - Invalid wake scancode\n");
+                                break;
+                        }
+
+                        /* Header */
+                        match[i]  = 0x93; /* mode1 = mode0 = 1, submode = 0 */
+                        mask[i++] = 0xFF;
+                        match[i]  = 0x0A; /* start bit = 1, mode2 = 1 */
+                        mask[i++] = 0x0F;
+
+                } else {
+                        do_wake = 0;
+                        dev_err(dev, "RC6 - Invalid wake mode\n");
+                }
+
+                break;
+
+        default:
+                do_wake = 0;
+                break;
+        }
+
+finish:
+        if (do_wake) {
+                /* Set compare and compare mask */
+                wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_INDEX,
+                               WBCIR_REGSEL_COMPARE | WBCIR_REG_ADDR0,
+                               0x3F);
+                outsb(data->wbase + WBCIR_REG_WCEIR_DATA, match, 11);
+                wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_INDEX,
+                               WBCIR_REGSEL_MASK | WBCIR_REG_ADDR0,
+                               0x3F);
+                outsb(data->wbase + WBCIR_REG_WCEIR_DATA, mask, 11);
+
+                /* RC6 Compare String Len */
+                outb(rc6_csl, data->wbase + WBCIR_REG_WCEIR_CSL);
+
+                /* Clear status bits NEC_REP, BUFF, MSG_END, MATCH */
+                wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_STS, 0x17, 0x17);
+
+                /* Clear BUFF_EN, Clear END_EN, Set MATCH_EN */
+                wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_EV_EN, 0x01, 0x07);
+
+                /* Set CEIR_EN */
+                wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_CTL, 0x01, 0x01);
+
+        } else {
+                /* Clear BUFF_EN, Clear END_EN, Clear MATCH_EN */
+                wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_EV_EN, 0x00, 0x07);
+
+                /* Clear CEIR_EN */
+                wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_CTL, 0x00, 0x01);
+        }
+
+        /* Disable interrupts */
+        outb(WBCIR_IRQ_NONE, data->sbase + WBCIR_REG_SP3_IER);
+}
+
+static int
+wbcir_suspend(struct pnp_dev *device, pm_message_t state)
+{
+        wbcir_shutdown(device);
+        return 0;
+}
+
+static int
+wbcir_resume(struct pnp_dev *device)
+{
+        struct wbcir_data *data = pnp_get_drvdata(device);
+
+        /* Clear BUFF_EN, Clear END_EN, Clear MATCH_EN */
+        wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_EV_EN, 0x00, 0x07);
+
+        /* Clear CEIR_EN */
+        wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_CTL, 0x00, 0x01);
+
+        /* Enable interrupts */
+        wbcir_reset_irdata(data);
+        outb(WBCIR_IRQ_RX | WBCIR_IRQ_ERR, data->sbase + WBCIR_REG_SP3_IER);
+
+        return 0;
+}
+
+
+
+/*****************************************************************************
+ *
+ * SETUP/INIT FUNCTIONS
+ *
+ *****************************************************************************/
+
+static void
+wbcir_cfg_ceir(struct wbcir_data *data)
+{
+        u8 tmp;
+
+        /* Set PROT_SEL, RX_INV, Clear CEIR_EN (needed for the led) */
+        tmp = protocol << 4;
+        if (invert)
+                tmp |= 0x08;
+        outb(tmp, data->wbase + WBCIR_REG_WCEIR_CTL);
+
+        /* Clear status bits NEC_REP, BUFF, MSG_END, MATCH */
+        wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_STS, 0x17, 0x17);
+
+        /* Clear BUFF_EN, Clear END_EN, Clear MATCH_EN */
+        wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_EV_EN, 0x00, 0x07);
+
+        /* Set RC5 cell time to correspond to 36 kHz */
+        wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_CFG1, 0x4A, 0x7F);
+
+        /* Set IRTX_INV */
+        if (invert)
+                outb(0x04, data->ebase + WBCIR_REG_ECEIR_CCTL);
+        else
+                outb(0x00, data->ebase + WBCIR_REG_ECEIR_CCTL);
+
+        /*
+         * Clear IR LED, set SP3 clock to 24Mhz
+         * set SP3_IRRX_SW to binary 01, helpfully not documented
+         */
+        outb(0x10, data->ebase + WBCIR_REG_ECEIR_CTS);
+}
+
+static int __devinit
+wbcir_probe(struct pnp_dev *device, const struct pnp_device_id *dev_id)
+{
+        struct device *dev = &device->dev;
+        struct wbcir_data *data;
+        int err;
+
+        if (!(pnp_port_len(device, 0) == EHFUNC_IOMEM_LEN &&
+              pnp_port_len(device, 1) == WAKEUP_IOMEM_LEN &&
+              pnp_port_len(device, 2) == SP_IOMEM_LEN)) {
+                dev_err(dev, "Invalid resources\n");
+                return -ENODEV;
+        }
+
+        data = kzalloc(sizeof(*data), GFP_KERNEL);
+        if (!data) {
+                err = -ENOMEM;
+                goto exit;
+        }
+
+        pnp_set_drvdata(device, data);
+
+        data->ebase = pnp_port_start(device, 0);
+        data->wbase = pnp_port_start(device, 1);
+        data->sbase = pnp_port_start(device, 2);
+        data->irq = pnp_irq(device, 0);
+
+        if (data->wbase == 0 || data->ebase == 0 ||
+            data->sbase == 0 || data->irq == 0) {
+                err = -ENODEV;
+                dev_err(dev, "Invalid resources\n");
+                goto exit_free_data;
+        }
+
+        dev_dbg(&device->dev, "Found device "
+                "(w: 0x%lX, e: 0x%lX, s: 0x%lX, i: %u)\n",
+                data->wbase, data->ebase, data->sbase, data->irq);
+
+        if (!request_region(data->wbase, WAKEUP_IOMEM_LEN, DRVNAME)) {
+                dev_err(dev, "Region 0x%lx-0x%lx already in use!\n",
+                        data->wbase, data->wbase + WAKEUP_IOMEM_LEN - 1);
+                err = -EBUSY;
+                goto exit_free_data;
+        }
+
+        if (!request_region(data->ebase, EHFUNC_IOMEM_LEN, DRVNAME)) {
+                dev_err(dev, "Region 0x%lx-0x%lx already in use!\n",
+                        data->ebase, data->ebase + EHFUNC_IOMEM_LEN - 1);
+                err = -EBUSY;
+                goto exit_release_wbase;
+        }
+
+        if (!request_region(data->sbase, SP_IOMEM_LEN, DRVNAME)) {
+                dev_err(dev, "Region 0x%lx-0x%lx already in use!\n",
+                        data->sbase, data->sbase + SP_IOMEM_LEN - 1);
+                err = -EBUSY;
+                goto exit_release_ebase;
+        }
+
+        err = request_irq(data->irq, wbcir_irq_handler,
+                          IRQF_DISABLED, DRVNAME, device);
+        if (err) {
+                dev_err(dev, "Failed to claim IRQ %u\n", data->irq);
+                err = -EBUSY;
+                goto exit_release_sbase;
+        }
+
+        led_trigger_register_simple("cir-tx", &data->txtrigger);
+        if (!data->txtrigger) {
+                err = -ENOMEM;
+                goto exit_free_irq;
+        }
+
+        led_trigger_register_simple("cir-rx", &data->rxtrigger);
+        if (!data->rxtrigger) {
+                err = -ENOMEM;
+                goto exit_unregister_txtrigger;
+        }
+
+        data->led.name = "cir::activity";
+        data->led.default_trigger = "cir-rx";
+        data->led.brightness_set = wbcir_led_brightness_set;
+        data->led.brightness_get = wbcir_led_brightness_get;
+        err = led_classdev_register(&device->dev, &data->led);
+        if (err)
+                goto exit_unregister_rxtrigger;
+
+        data->input_dev = input_allocate_device();
+        if (!data->input_dev) {
+                err = -ENOMEM;
+                goto exit_unregister_led;
+        }
+
+        data->input_dev->evbit[0] = BIT(EV_KEY);
+        data->input_dev->name = WBCIR_NAME;
+        data->input_dev->phys = "wbcir/cir0";
+        data->input_dev->id.bustype = BUS_HOST;
+        data->input_dev->id.vendor  = PCI_VENDOR_ID_WINBOND;
+        data->input_dev->id.product = WBCIR_ID_FAMILY;
+        data->input_dev->id.version = WBCIR_ID_CHIP;
+        data->input_dev->getkeycode = wbcir_getkeycode;
+        data->input_dev->setkeycode = wbcir_setkeycode;
+        input_set_capability(data->input_dev, EV_MSC, MSC_SCAN);
+        input_set_drvdata(data->input_dev, data);
+
+        err = input_register_device(data->input_dev);
+        if (err)
+                goto exit_free_input;
+
+        data->last_scancode = INVALID_SCANCODE;
+        INIT_LIST_HEAD(&data->keytable);
+        setup_timer(&data->timer_keyup, wbcir_keyup, (unsigned long)data);
+
+        /* Load default keymaps */
+        if (protocol == IR_PROTOCOL_RC6) {
+                int i;
+                for (i = 0; i < ARRAY_SIZE(rc6_def_keymap); i++) {
+                        err = wbcir_setkeycode(data->input_dev,
+                                               (int)rc6_def_keymap[i].scancode,
+                                               (int)rc6_def_keymap[i].keycode);
+                        if (err)
+                                goto exit_unregister_keys;
+                }
+        }
+
+        device_init_wakeup(&device->dev, 1);
+
+        wbcir_cfg_ceir(data);
+
+        /* Disable interrupts */
+        wbcir_select_bank(data, WBCIR_BANK_0);
+        outb(WBCIR_IRQ_NONE, data->sbase + WBCIR_REG_SP3_IER);
+
+        /* Enable extended mode */
+        wbcir_select_bank(data, WBCIR_BANK_2);
+        outb(WBCIR_EXT_ENABLE, data->sbase + WBCIR_REG_SP3_EXCR1);
+
+        /*
+         * Configure baud generator, IR data will be sampled at
+         * a bitrate of: (24Mhz * prescaler) / (divisor * 16).
+         *
+         * The ECIR registers include a flag to change the
+         * 24Mhz clock freq to 48Mhz.
+         *
+         * It's not documented in the specs, but fifo levels
+         * other than 16 seems to be unsupported.
+         */
+
+        /* prescaler 1.0, tx/rx fifo lvl 16 */
+        outb(0x30, data->sbase + WBCIR_REG_SP3_EXCR2);
+
+        /* Set baud divisor to generate one byte per bit/cell */
+        switch (protocol) {
+        case IR_PROTOCOL_RC5:
+                outb(0xA7, data->sbase + WBCIR_REG_SP3_BGDL);
+                break;
+        case IR_PROTOCOL_RC6:
+                outb(0x53, data->sbase + WBCIR_REG_SP3_BGDL);
+                break;
+        case IR_PROTOCOL_NEC:
+                outb(0x69, data->sbase + WBCIR_REG_SP3_BGDL);
+                break;
+        }
+        outb(0x00, data->sbase + WBCIR_REG_SP3_BGDH);
+
+        /* Set CEIR mode */
+        wbcir_select_bank(data, WBCIR_BANK_0);
+        outb(0xC0, data->sbase + WBCIR_REG_SP3_MCR);
+        inb(data->sbase + WBCIR_REG_SP3_LSR); /* Clear LSR */
+        inb(data->sbase + WBCIR_REG_SP3_MSR); /* Clear MSR */
+
+        /* Disable RX demod, run-length encoding/decoding, set freq span */
+        wbcir_select_bank(data, WBCIR_BANK_7);
+        outb(0x10, data->sbase + WBCIR_REG_SP3_RCCFG);
+
+        /* Disable timer */
+        wbcir_select_bank(data, WBCIR_BANK_4);
+        outb(0x00, data->sbase + WBCIR_REG_SP3_IRCR1);
+
+        /* Enable MSR interrupt, Clear AUX_IRX */
+        wbcir_select_bank(data, WBCIR_BANK_5);
+        outb(0x00, data->sbase + WBCIR_REG_SP3_IRCR2);
+
+        /* Disable CRC */
+        wbcir_select_bank(data, WBCIR_BANK_6);
+        outb(0x20, data->sbase + WBCIR_REG_SP3_IRCR3);
+
+        /* Set RX/TX (de)modulation freq, not really used */
+        wbcir_select_bank(data, WBCIR_BANK_7);
+        outb(0xF2, data->sbase + WBCIR_REG_SP3_IRRXDC);
+        outb(0x69, data->sbase + WBCIR_REG_SP3_IRTXMC);
+
+        /* Set invert and pin direction */
+        if (invert)
+                outb(0x10, data->sbase + WBCIR_REG_SP3_IRCFG4);
+        else
+                outb(0x00, data->sbase + WBCIR_REG_SP3_IRCFG4);
+
+        /* Set FIFO thresholds (RX = 8, TX = 3), reset RX/TX */
+        wbcir_select_bank(data, WBCIR_BANK_0);
+        outb(0x97, data->sbase + WBCIR_REG_SP3_FCR);
+
+        /* Clear AUX status bits */
+        outb(0xE0, data->sbase + WBCIR_REG_SP3_ASCR);
+
+        /* Enable interrupts */
+        outb(WBCIR_IRQ_RX | WBCIR_IRQ_ERR, data->sbase + WBCIR_REG_SP3_IER);
+
+        return 0;
+
+exit_unregister_keys:
+        if (!list_empty(&data->keytable)) {
+                struct wbcir_keyentry *key;
+                struct wbcir_keyentry *keytmp;
+
+                list_for_each_entry_safe(key, keytmp, &data->keytable, list) {
+                        list_del(&key->list);
+                        kfree(key);
+                }
+        }
+        input_unregister_device(data->input_dev);
+        /* Can't call input_free_device on an unregistered device */
+        data->input_dev = NULL;
+exit_free_input:
+        input_free_device(data->input_dev);
+exit_unregister_led:
+        led_classdev_unregister(&data->led);
+exit_unregister_rxtrigger:
+        led_trigger_unregister_simple(data->rxtrigger);
+exit_unregister_txtrigger:
+        led_trigger_unregister_simple(data->txtrigger);
+exit_free_irq:
+        free_irq(data->irq, device);
+exit_release_sbase:
+        release_region(data->sbase, SP_IOMEM_LEN);
+exit_release_ebase:
+        release_region(data->ebase, EHFUNC_IOMEM_LEN);
+exit_release_wbase:
+        release_region(data->wbase, WAKEUP_IOMEM_LEN);
+exit_free_data:
+        kfree(data);
+        pnp_set_drvdata(device, NULL);
+exit:
+        return err;
+}
+
+static void __devexit
+wbcir_remove(struct pnp_dev *device)
+{
+        struct wbcir_data *data = pnp_get_drvdata(device);
+        struct wbcir_keyentry *key;
+        struct wbcir_keyentry *keytmp;
+
+        /* Disable interrupts */
+        wbcir_select_bank(data, WBCIR_BANK_0);
+        outb(WBCIR_IRQ_NONE, data->sbase + WBCIR_REG_SP3_IER);
+
+        del_timer_sync(&data->timer_keyup);
+
+        free_irq(data->irq, device);
+
+        /* Clear status bits NEC_REP, BUFF, MSG_END, MATCH */
+        wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_STS, 0x17, 0x17);
+
+        /* Clear CEIR_EN */
+        wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_CTL, 0x00, 0x01);
+
+        /* Clear BUFF_EN, END_EN, MATCH_EN */
+        wbcir_set_bits(data->wbase + WBCIR_REG_WCEIR_EV_EN, 0x00, 0x07);
+
+        /* This will generate a keyup event if necessary */
+        input_unregister_device(data->input_dev);
+
+        led_trigger_unregister_simple(data->rxtrigger);
+        led_trigger_unregister_simple(data->txtrigger);
+        led_classdev_unregister(&data->led);
+
+        /* This is ok since &data->led isn't actually used */
+        wbcir_led_brightness_set(&data->led, LED_OFF);
+
+        release_region(data->wbase, WAKEUP_IOMEM_LEN);
+        release_region(data->ebase, EHFUNC_IOMEM_LEN);
+        release_region(data->sbase, SP_IOMEM_LEN);
+
+        list_for_each_entry_safe(key, keytmp, &data->keytable, list) {
+                list_del(&key->list);
+                kfree(key);
+        }
+
+        kfree(data);
+
+        pnp_set_drvdata(device, NULL);
+}
+
+static const struct pnp_device_id wbcir_ids[] = {
+        { "WEC1022", 0 },
+        { "", 0 }
+};
+MODULE_DEVICE_TABLE(pnp, wbcir_ids);
+
+static struct pnp_driver wbcir_driver = {
+        .name     = WBCIR_NAME,
+        .id_table = wbcir_ids,
+        .probe    = wbcir_probe,
+        .remove   = __devexit_p(wbcir_remove),
+        .suspend  = wbcir_suspend,
+        .resume   = wbcir_resume,
+        .shutdown = wbcir_shutdown
+};
+
+static int __init
+wbcir_init(void)
+{
+        int ret;
+
+        switch (protocol) {
+        case IR_PROTOCOL_RC5:
+        case IR_PROTOCOL_NEC:
+        case IR_PROTOCOL_RC6:
+                break;
+        default:
+                printk(KERN_ERR DRVNAME ": Invalid protocol argument\n");
+                return -EINVAL;
+        }
+
+        ret = pnp_register_driver(&wbcir_driver);
+        if (ret)
+                printk(KERN_ERR DRVNAME ": Unable to register driver\n");
+
+        return ret;
+}
+
+static void __exit
+wbcir_exit(void)
+{
+        pnp_unregister_driver(&wbcir_driver);
+}
+
+MODULE_AUTHOR("David Härdeman <david@hardeman.nu>");
+MODULE_DESCRIPTION("Winbond SuperI/O Consumer IR Driver");
+MODULE_LICENSE("GPL");
+
+module_init(wbcir_init);
+module_exit(wbcir_exit);
+
+
diff --git a/drivers/isdn/capi/capifs.c b/drivers/isdn/capi/capifs.c
index bff72d81f263..9f8f67b6c07f 100644
--- a/drivers/isdn/capi/capifs.c
+++ b/drivers/isdn/capi/capifs.c
@@ -89,7 +89,7 @@ static int capifs_remount(struct super_block *s, int *flags, char *data)
         return 0;
 }
 
-static struct super_operations capifs_sops =
+static const struct super_operations capifs_sops =
 {
         .statfs         = simple_statfs,
         .remount_fs     = capifs_remount,
diff --git a/drivers/isdn/capi/capiutil.c b/drivers/isdn/capi/capiutil.c
index 16f2e465e5f9..26626eead828 100644
--- a/drivers/isdn/capi/capiutil.c
+++ b/drivers/isdn/capi/capiutil.c
@@ -1019,7 +1019,7 @@ int __init cdebug_init(void)
         if (!g_debbuf->buf) {
                 kfree(g_cmsg);
                 kfree(g_debbuf);
-                return -ENOMEM;;
+                return -ENOMEM;
         }
         g_debbuf->size = CDEBUG_GSIZE;
         g_debbuf->buf[0] = 0;
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index 7188c59a76ff..adb1e8c36b46 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -761,7 +761,7 @@ isdn_getnum(char **p)
  * Be aware that this is not an atomic operation when sleep != 0, even though 
  * interrupts are turned off! Well, like that we are currently only called
  * on behalf of a read system call on raw device files (which are documented
- * to be dangerous and for for debugging purpose only). The inode semaphore
+ * to be dangerous and for debugging purpose only). The inode semaphore
  * takes care that this is not called for the same minor device number while
  * we are sleeping, but access is not serialized against simultaneous read()
  * from the corresponding ttyI device. Can other ugly events, like changes
@@ -873,7 +873,7 @@ isdn_readbchan(int di, int channel, u_char * buf, u_char * fp, int len, wait_que
  * Be aware that this is not an atomic operation when sleep != 0, even though
  * interrupts are turned off! Well, like that we are currently only called
  * on behalf of a read system call on raw device files (which are documented
- * to be dangerous and for for debugging purpose only). The inode semaphore
+ * to be dangerous and for debugging purpose only). The inode semaphore
  * takes care that this is not called for the same minor device number while
  * we are sleeping, but access is not serialized against simultaneous read()
  * from the corresponding ttyI device. Can other ugly events, like changes
diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
index a8d0aee3bc0e..8aaad65c3bb5 100644
--- a/drivers/lguest/page_tables.c
+++ b/drivers/lguest/page_tables.c
@@ -894,7 +894,7 @@ void guest_set_pte(struct lg_cpu *cpu,
  * tells us they've changed.  When the Guest tries to use the new entry it will
  * fault and demand_page() will fix it up.
  *
- * So with that in mind here's our code to to update a (top-level) PGD entry:
+ * So with that in mind here's our code to update a (top-level) PGD entry:
  */
 void guest_set_pgd(struct lguest *lg, unsigned long gpgdir, u32 idx)
 {
diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c
index a98ab72adf95..93fb32038b14 100644
--- a/drivers/macintosh/rack-meter.c
+++ b/drivers/macintosh/rack-meter.c
@@ -274,7 +274,7 @@ static void __devinit rackmeter_init_cpu_sniffer(struct rackmeter *rm)
 
                 if (cpu > 1)
                         continue;
-                rcpu = &rm->cpu[cpu];;
+                rcpu = &rm->cpu[cpu];
                 rcpu->prev_idle = get_cpu_idle_time(cpu);
                 rcpu->prev_wall = jiffies64_to_cputime64(get_jiffies_64());
                 schedule_delayed_work_on(cpu, &rm->cpu[cpu].sniffer,
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index eee28fac210c..376f1ab48a24 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1716,7 +1716,7 @@ out:
         return r;
 }
 
-static struct block_device_operations dm_blk_dops;
+static const struct block_device_operations dm_blk_dops;
 
 static void dm_wq_work(struct work_struct *work);
 
@@ -2663,7 +2663,7 @@ void dm_free_md_mempools(struct dm_md_mempools *pools)
         kfree(pools);
 }
 
-static struct block_device_operations dm_blk_dops = {
+static const struct block_device_operations dm_blk_dops = {
         .open = dm_blk_open,
         .release = dm_blk_close,
         .ioctl = dm_blk_ioctl,
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 9dd872000cec..6aa497e4baf8 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -138,7 +138,7 @@ static ctl_table raid_root_table[] = {
         { .ctl_name = 0 }
 };
 
-static struct block_device_operations md_fops;
+static const struct block_device_operations md_fops;
 
 static int start_readonly;
 
@@ -5556,7 +5556,7 @@ static int md_revalidate(struct gendisk *disk)
         mddev->changed = 0;
         return 0;
 }
-static struct block_device_operations md_fops =
+static const struct block_device_operations md_fops =
 {
         .owner          = THIS_MODULE,
         .open           = md_open,
diff --git a/drivers/md/md.h b/drivers/md/md.h
index f8fc188bc762..f55d2ff95133 100644
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -201,7 +201,7 @@ struct mddev_s
          * INTR:     resync needs to be aborted for some reason
          * DONE:     thread is done and is waiting to be reaped
          * REQUEST:  user-space has requested a sync (used with SYNC)
-         * CHECK:    user-space request for for check-only, no repair
+         * CHECK:    user-space request for check-only, no repair
          * RESHAPE:  A reshape is happening
          *
          * If neither SYNC or RESHAPE are set, then it is a recovery.
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index 89e76819f61f..d2d3fd54cc68 100644
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -150,6 +150,7 @@ static int multipath_make_request (struct request_queue *q, struct bio * bio)
         }
 
         mp_bh = mempool_alloc(conf->pool, GFP_NOIO);
+        memset(mp_bh, 0, sizeof(*mp_bh));
 
         mp_bh->master_bio = bio;
         mp_bh->mddev = mddev;
@@ -493,7 +494,7 @@ static int multipath_run (mddev_t *mddev)
         }
         mddev->degraded = conf->raid_disks - conf->working_disks;
 
-        conf->pool = mempool_create_kzalloc_pool(NR_RESERVED_BUFS,
+        conf->pool = mempool_create_kmalloc_pool(NR_RESERVED_BUFS,
                                                  sizeof(struct multipath_bh));
         if (conf->pool == NULL) {
                 printk(KERN_ERR 
diff --git a/drivers/media/dvb/pt1/pt1.c b/drivers/media/dvb/pt1/pt1.c
index 8ffbcecad931..81e623a90f09 100644
--- a/drivers/media/dvb/pt1/pt1.c
+++ b/drivers/media/dvb/pt1/pt1.c
@@ -23,6 +23,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/vmalloc.h>
 #include <linux/pci.h>
 #include <linux/kthread.h>
 #include <linux/freezer.h>
diff --git a/drivers/media/dvb/siano/smscoreapi.c b/drivers/media/dvb/siano/smscoreapi.c
index bd9ab9d0d12a..fa6a62369a78 100644
--- a/drivers/media/dvb/siano/smscoreapi.c
+++ b/drivers/media/dvb/siano/smscoreapi.c
@@ -1367,7 +1367,7 @@ int smscore_set_gpio(struct smscore_device_t *coredev, u32 pin, int level)
                                             &msg, sizeof(msg));
 }
 
-/* new GPIO managment implementation */
+/* new GPIO management implementation */
 static int GetGpioPinParams(u32 PinNum, u32 *pTranslatedPinNum,
                 u32 *pGroupNum, u32 *pGroupCfg) {
 
diff --git a/drivers/media/dvb/siano/smscoreapi.h b/drivers/media/dvb/siano/smscoreapi.h
index f1108c64e895..eec18aaf5512 100644
--- a/drivers/media/dvb/siano/smscoreapi.h
+++ b/drivers/media/dvb/siano/smscoreapi.h
@@ -657,12 +657,12 @@ struct smscore_buffer_t *smscore_getbuffer(struct smscore_device_t *coredev);
 extern void smscore_putbuffer(struct smscore_device_t *coredev,
                               struct smscore_buffer_t *cb);
 
-/* old GPIO managment */
+/* old GPIO management */
 int smscore_configure_gpio(struct smscore_device_t *coredev, u32 pin,
                            struct smscore_config_gpio *pinconfig);
 int smscore_set_gpio(struct smscore_device_t *coredev, u32 pin, int level);
 
-/* new GPIO managment */
+/* new GPIO management */
 extern int smscore_gpio_configure(struct smscore_device_t *coredev, u8 PinNum,
                 struct smscore_gpio_config *pGpioConfig);
 extern int smscore_gpio_set_level(struct smscore_device_t *coredev, u8 PinNum,
diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c
index 575bf9d89419..a1239083472d 100644
--- a/drivers/media/radio/radio-mr800.c
+++ b/drivers/media/radio/radio-mr800.c
@@ -46,7 +46,7 @@
  * Version 0.11:        Converted to v4l2_device.
  *
  * Many things to do:
- *      - Correct power managment of device (suspend & resume)
+ *      - Correct power management of device (suspend & resume)
  *      - Add code for scanning and smooth tuning
  *      - Add code for sensitivity value
  *      - Correct mistakes
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 356d6896da3f..fbdc1cde56a6 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1371,7 +1371,7 @@ static struct cx8802_driver cx8802_blackbird_driver = {
         .advise_release = cx8802_blackbird_advise_release,
 };
 
-static int blackbird_init(void)
+static int __init blackbird_init(void)
 {
         printk(KERN_INFO "cx2388x blackbird driver version %d.%d.%d loaded\n",
                (CX88_VERSION_CODE >> 16) & 0xff,
@@ -1384,7 +1384,7 @@ static int blackbird_init(void)
         return cx8802_register_driver(&cx8802_blackbird_driver);
 }
 
-static void blackbird_fini(void)
+static void __exit blackbird_fini(void)
 {
         cx8802_unregister_driver(&cx8802_blackbird_driver);
 }
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 6e5d142b5b00..518bcfe18bcb 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -1350,7 +1350,7 @@ static struct cx8802_driver cx8802_dvb_driver = {
         .advise_release = cx8802_dvb_advise_release,
 };
 
-static int dvb_init(void)
+static int __init dvb_init(void)
 {
         printk(KERN_INFO "cx88/2: cx2388x dvb driver version %d.%d.%d loaded\n",
                (CX88_VERSION_CODE >> 16) & 0xff,
@@ -1363,7 +1363,7 @@ static int dvb_init(void)
         return cx8802_register_driver(&cx8802_dvb_driver);
 }
 
-static void dvb_fini(void)
+static void __exit dvb_fini(void)
 {
         cx8802_unregister_driver(&cx8802_dvb_driver);
 }
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c
index 7172dcf2a4fa..de9ff0fc741f 100644
--- a/drivers/media/video/cx88/cx88-mpeg.c
+++ b/drivers/media/video/cx88/cx88-mpeg.c
@@ -870,7 +870,7 @@ static struct pci_driver cx8802_pci_driver = {
         .remove   = __devexit_p(cx8802_remove),
 };
 
-static int cx8802_init(void)
+static int __init cx8802_init(void)
 {
         printk(KERN_INFO "cx88/2: cx2388x MPEG-TS Driver Manager version %d.%d.%d loaded\n",
                (CX88_VERSION_CODE >> 16) & 0xff,
@@ -883,7 +883,7 @@ static int cx8802_init(void)
         return pci_register_driver(&cx8802_pci_driver);
 }
 
-static void cx8802_fini(void)
+static void __exit cx8802_fini(void)
 {
         pci_unregister_driver(&cx8802_pci_driver);
 }
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 81d2b5dea18e..57e6b1241090 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -2113,7 +2113,7 @@ static struct pci_driver cx8800_pci_driver = {
 #endif
 };
 
-static int cx8800_init(void)
+static int __init cx8800_init(void)
 {
         printk(KERN_INFO "cx88/0: cx2388x v4l2 driver version %d.%d.%d loaded\n",
                (CX88_VERSION_CODE >> 16) & 0xff,
@@ -2126,7 +2126,7 @@ static int cx8800_init(void)
         return pci_register_driver(&cx8800_pci_driver);
 }
 
-static void cx8800_fini(void)
+static void __exit cx8800_fini(void)
 {
         pci_unregister_driver(&cx8800_pci_driver);
 }
diff --git a/drivers/media/video/gspca/m5602/m5602_core.c b/drivers/media/video/gspca/m5602/m5602_core.c
index 8a5bba16ff32..7f1e5415850b 100644
--- a/drivers/media/video/gspca/m5602/m5602_core.c
+++ b/drivers/media/video/gspca/m5602/m5602_core.c
@@ -56,7 +56,7 @@ int m5602_read_bridge(struct sd *sd, const u8 address, u8 *i2c_data)
         return (err < 0) ? err : 0;
 }
 
-/* Writes a byte to to the m5602 */
+/* Writes a byte to the m5602 */
 int m5602_write_bridge(struct sd *sd, const u8 address, const u8 i2c_data)
 {
         int err;
diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c
index 7847bbc1440d..bd83fa0a4970 100644
--- a/drivers/memstick/core/mspro_block.c
+++ b/drivers/memstick/core/mspro_block.c
@@ -235,7 +235,7 @@ static int mspro_block_bd_getgeo(struct block_device *bdev,
         return 0;
 }
 
-static struct block_device_operations ms_block_bdops = {
+static const struct block_device_operations ms_block_bdops = {
         .open    = mspro_block_bd_open,
         .release = mspro_block_bd_release,
         .getgeo  = mspro_block_bd_getgeo,
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 76fa2ee0b574..610e914abe6c 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -6821,7 +6821,7 @@ mpt_print_ioc_summary(MPT_ADAPTER *ioc, char *buffer, int *size, int len, int sh
         *size = y;
 }
 /**
- *      mpt_set_taskmgmt_in_progress_flag - set flags associated with task managment
+ *      mpt_set_taskmgmt_in_progress_flag - set flags associated with task management
  *      @ioc: Pointer to MPT_ADAPTER structure
  *
  *      Returns 0 for SUCCESS or -1 if FAILED.
@@ -6854,7 +6854,7 @@ mpt_set_taskmgmt_in_progress_flag(MPT_ADAPTER *ioc)
 EXPORT_SYMBOL(mpt_set_taskmgmt_in_progress_flag);
 
 /**
- *      mpt_clear_taskmgmt_in_progress_flag - clear flags associated with task managment
+ *      mpt_clear_taskmgmt_in_progress_flag - clear flags associated with task management
  *      @ioc: Pointer to MPT_ADAPTER structure
  *
  **/
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index 335d4c78a775..d505b68cd372 100644
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -925,7 +925,7 @@ static void i2o_block_request_fn(struct request_queue *q)
 };
 
 /* I2O Block device operations definition */
-static struct block_device_operations i2o_block_fops = {
+static const struct block_device_operations i2o_block_fops = {
         .owner = THIS_MODULE,
         .open = i2o_block_open,
         .release = i2o_block_release,
diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c
index c533f86ff5ea..5447da16a170 100644
--- a/drivers/mfd/ab3100-core.c
+++ b/drivers/mfd/ab3100-core.c
@@ -647,7 +647,7 @@ struct ab3100_init_setting {
         u8 setting;
 };
 
-static const struct ab3100_init_setting __initdata
+static const struct ab3100_init_setting __initconst
 ab3100_init_settings[] = {
         {
                 .abreg = AB3100_MCA,
diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c
index de966a6fb7e6..aecf40ecb3a4 100644
--- a/drivers/misc/ibmasm/ibmasmfs.c
+++ b/drivers/misc/ibmasm/ibmasmfs.c
@@ -97,7 +97,7 @@ static int ibmasmfs_get_super(struct file_system_type *fst,
         return get_sb_single(fst, flags, data, ibmasmfs_fill_super, mnt);
 }
 
-static struct super_operations ibmasmfs_s_ops = {
+static const struct super_operations ibmasmfs_s_ops = {
         .statfs         = simple_statfs,
         .drop_inode     = generic_delete_inode,
 };
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index adc205c49fbf..85f0e8cd875b 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -130,7 +130,7 @@ mmc_blk_getgeo(struct block_device *bdev, struct hd_geometry *geo)
         return 0;
 }
 
-static struct block_device_operations mmc_bdops = {
+static const struct block_device_operations mmc_bdops = {
         .open                   = mmc_blk_open,
         .release                = mmc_blk_release,
         .getgeo                 = mmc_blk_getgeo,
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c
index bc14bb1b0579..88671529c45d 100644
--- a/drivers/mmc/host/mxcmmc.c
+++ b/drivers/mmc/host/mxcmmc.c
@@ -512,7 +512,7 @@ static void mxcmci_cmd_done(struct mxcmci_host *host, unsigned int stat)
         }
 
         /* For the DMA case the DMA engine handles the data transfer
-         * automatically. For non DMA we have to to it ourselves.
+         * automatically. For non DMA we have to do it ourselves.
          * Don't do it in interrupt context though.
          */
         if (!mxcmci_use_dma(host) && host->data)
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 10ed195c0c1c..eb495d83064f 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -776,13 +776,13 @@ static struct spi_driver m25p80_driver = {
 };
 
 
-static int m25p80_init(void)
+static int __init m25p80_init(void)
 {
         return spi_register_driver(&m25p80_driver);
 }
 
 
-static void m25p80_exit(void)
+static void __exit m25p80_exit(void)
 {
         spi_unregister_driver(&m25p80_driver);
 }
diff --git a/drivers/mtd/devices/slram.c b/drivers/mtd/devices/slram.c
index 00248e81ecd5..7d846e9173da 100644
--- a/drivers/mtd/devices/slram.c
+++ b/drivers/mtd/devices/slram.c
@@ -303,7 +303,7 @@ __setup("slram=", mtd_slram_setup);
 
 #endif
 
-static int init_slram(void)
+static int __init init_slram(void)
 {
         char *devname;
         int i;
diff --git a/drivers/mtd/ftl.c b/drivers/mtd/ftl.c
index a790c062af1f..e56d6b42f020 100644
--- a/drivers/mtd/ftl.c
+++ b/drivers/mtd/ftl.c
@@ -1099,7 +1099,7 @@ static struct mtd_blktrans_ops ftl_tr = {
         .owner          = THIS_MODULE,
 };
 
-static int init_ftl(void)
+static int __init init_ftl(void)
 {
         return register_mtd_blktrans(&ftl_tr);
 }
diff --git a/drivers/mtd/maps/ixp2000.c b/drivers/mtd/maps/ixp2000.c
index d4fb9a3ab4df..1bdf0ee6d0b6 100644
--- a/drivers/mtd/maps/ixp2000.c
+++ b/drivers/mtd/maps/ixp2000.c
@@ -184,7 +184,7 @@ static int ixp2000_flash_probe(struct platform_device *dev)
         info->map.bankwidth = 1;
 
         /*
-         * map_priv_2 is used to store a ptr to to the bank_setup routine
+         * map_priv_2 is used to store a ptr to the bank_setup routine
          */
         info->map.map_priv_2 = (unsigned long) ixp_data->bank_setup;
 
diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
index 7baba40c1ed2..0acbf4f5be50 100644
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
@@ -210,7 +210,7 @@ static int blktrans_ioctl(struct block_device *bdev, fmode_t mode,
         }
 }
 
-static struct block_device_operations mtd_blktrans_ops = {
+static const struct block_device_operations mtd_blktrans_ops = {
         .owner          = THIS_MODULE,
         .open           = blktrans_open,
         .release        = blktrans_release,
diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c
index 29acd06b1c39..1b4690bdfdb3 100644
--- a/drivers/mtd/nand/cafe_nand.c
+++ b/drivers/mtd/nand/cafe_nand.c
@@ -903,12 +903,12 @@ static struct pci_driver cafe_nand_pci_driver = {
         .resume = cafe_nand_resume,
 };
 
-static int cafe_nand_init(void)
+static int __init cafe_nand_init(void)
 {
         return pci_register_driver(&cafe_nand_pci_driver);
 }
 
-static void cafe_nand_exit(void)
+static void __exit cafe_nand_exit(void)
 {
         pci_unregister_driver(&cafe_nand_pci_driver);
 }
diff --git a/drivers/mtd/nand/cmx270_nand.c b/drivers/mtd/nand/cmx270_nand.c
index 10081e656a6f..826cacffcefc 100644
--- a/drivers/mtd/nand/cmx270_nand.c
+++ b/drivers/mtd/nand/cmx270_nand.c
@@ -147,7 +147,7 @@ static int cmx270_device_ready(struct mtd_info *mtd)
 /*
  * Main initialization routine
  */
-static int cmx270_init(void)
+static int __init cmx270_init(void)
 {
         struct nand_chip *this;
         const char *part_type;
@@ -261,7 +261,7 @@ module_init(cmx270_init);
 /*
  * Clean up routine
  */
-static void cmx270_cleanup(void)
+static void __exit cmx270_cleanup(void)
 {
         /* Release resources, unregister device */
         nand_release(cmx270_nand_mtd);
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c
index e4d9ef0c965a..9f87c99189a9 100644
--- a/drivers/mtd/ubi/eba.c
+++ b/drivers/mtd/ubi/eba.c
@@ -1065,7 +1065,7 @@ int ubi_eba_copy_leb(struct ubi_device *ubi, int from, int to,
         }
 
         /*
-         * Now we have got to calculate how much data we have to to copy. In
+         * Now we have got to calculate how much data we have to copy. In
          * case of a static volume it is fairly easy - the VID header contains
          * the data size. In case of a dynamic volume it is more difficult - we
          * have to read the contents, cut 0xFF bytes from the end and copy only
diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h
index c290f51dd178..1af08178defd 100644
--- a/drivers/mtd/ubi/ubi.h
+++ b/drivers/mtd/ubi/ubi.h
@@ -570,7 +570,7 @@ void ubi_do_get_volume_info(struct ubi_device *ubi, struct ubi_volume *vol,
 
 /*
  * ubi_rb_for_each_entry - walk an RB-tree.
- * @rb: a pointer to type 'struct rb_node' to to use as a loop counter
+ * @rb: a pointer to type 'struct rb_node' to use as a loop counter
  * @pos: a pointer to RB-tree entry type to use as a loop counter
  * @root: RB-tree's root
  * @member: the name of the 'struct rb_node' within the RB-tree entry
diff --git a/drivers/net/arcnet/arc-rawmode.c b/drivers/net/arcnet/arc-rawmode.c
index 646dfc5f50c9..8ea9c7545c12 100644
--- a/drivers/net/arcnet/arc-rawmode.c
+++ b/drivers/net/arcnet/arc-rawmode.c
@@ -123,7 +123,6 @@ static void rx(struct net_device *dev, int bufnum,
         BUGLVL(D_SKB) arcnet_dump_skb(dev, skb, "rx");
 
         skb->protocol = cpu_to_be16(ETH_P_ARCNET);
-;
         netif_rx(skb);
 }
 
diff --git a/drivers/net/arcnet/capmode.c b/drivers/net/arcnet/capmode.c
index 083e21094b20..66bcbbb6babc 100644
--- a/drivers/net/arcnet/capmode.c
+++ b/drivers/net/arcnet/capmode.c
@@ -149,7 +149,6 @@ static void rx(struct net_device *dev, int bufnum,
         BUGLVL(D_SKB) arcnet_dump_skb(dev, skb, "rx");
 
         skb->protocol = cpu_to_be16(ETH_P_ARCNET);
-;
         netif_rx(skb);
 }
 
diff --git a/drivers/net/bnx2x_reg.h b/drivers/net/bnx2x_reg.h
index 0695be14cf91..aa76cbada5e2 100644
--- a/drivers/net/bnx2x_reg.h
+++ b/drivers/net/bnx2x_reg.h
@@ -3122,7 +3122,7 @@
    The fields are:[4:0] - tail pointer; [10:5] - Link List size; 15:11] -
    header pointer. */
 #define TCM_REG_XX_TABLE                                         0x50240
-/* [RW 4] Load value for for cfc ac credit cnt. */
+/* [RW 4] Load value for cfc ac credit cnt. */
 #define TM_REG_CFC_AC_CRDCNT_VAL                                 0x164208
 /* [RW 4] Load value for cfc cld credit cnt. */
 #define TM_REG_CFC_CLD_CRDCNT_VAL                                0x164210
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index cea5cfe23b71..c3fa31c9f2a7 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -1987,7 +1987,7 @@ void bond_3ad_unbind_slave(struct slave *slave)
                         // find new aggregator for the related port(s)
                         new_aggregator = __get_first_agg(port);
                         for (; new_aggregator; new_aggregator = __get_next_agg(new_aggregator)) {
-                                // if the new aggregator is empty, or it connected to to our port only
+                                // if the new aggregator is empty, or it is connected to our port only
                                 if (!new_aggregator->lag_ports || ((new_aggregator->lag_ports == port) && !new_aggregator->lag_ports->next_port_in_aggregator)) {
                                         break;
                                 }
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index cda6b397550d..45ac225a7aaa 100644
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/e1000/e1000_hw.c
@@ -3035,7 +3035,7 @@ s32 e1000_check_for_link(struct e1000_hw *hw)
                 /* If TBI compatibility is was previously off, turn it on. For
                  * compatibility with a TBI link partner, we will store bad
                  * packets. Some frames have an additional byte on the end and
-                 * will look like CRC errors to to the hardware.
+                 * will look like CRC errors to the hardware.
                  */
                 if (!hw->tbi_compatibility_on) {
                     hw->tbi_compatibility_on = true;
diff --git a/drivers/net/gianfar_ethtool.c b/drivers/net/gianfar_ethtool.c
index 2234118eedbb..6c144b525b47 100644
--- a/drivers/net/gianfar_ethtool.c
+++ b/drivers/net/gianfar_ethtool.c
@@ -293,7 +293,7 @@ static int gfar_gcoalesce(struct net_device *dev, struct ethtool_coalesce *cvals
         rxtime  = get_ictt_value(priv->rxic);
         rxcount = get_icft_value(priv->rxic);
         txtime  = get_ictt_value(priv->txic);
-        txcount = get_icft_value(priv->txic);;
+        txcount = get_icft_value(priv->txic);
         cvals->rx_coalesce_usecs = gfar_ticks2usecs(priv, rxtime);
         cvals->rx_max_coalesced_frames = rxcount;
 
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 1d7d7fef414f..89c82c5e63e4 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -2556,13 +2556,13 @@ static int __devinit emac_init_config(struct emac_instance *dev)
         if (emac_read_uint_prop(np, "mdio-device", &dev->mdio_ph, 0))
                 dev->mdio_ph = 0;
         if (emac_read_uint_prop(np, "zmii-device", &dev->zmii_ph, 0))
-                dev->zmii_ph = 0;;
+                dev->zmii_ph = 0;
         if (emac_read_uint_prop(np, "zmii-channel", &dev->zmii_port, 0))
-                dev->zmii_port = 0xffffffff;;
+                dev->zmii_port = 0xffffffff;
         if (emac_read_uint_prop(np, "rgmii-device", &dev->rgmii_ph, 0))
-                dev->rgmii_ph = 0;;
+                dev->rgmii_ph = 0;
         if (emac_read_uint_prop(np, "rgmii-channel", &dev->rgmii_port, 0))
-                dev->rgmii_port = 0xffffffff;;
+                dev->rgmii_port = 0xffffffff;
         if (emac_read_uint_prop(np, "fifo-entry-size", &dev->fifo_entry_size, 0))
                 dev->fifo_entry_size = 16;
         if (emac_read_uint_prop(np, "mal-burst-size", &dev->mal_burst_size, 0))
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index d2639c4a086d..5d6c1530a8c0 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -3966,7 +3966,7 @@ static int igb_set_vf_multicasts(struct igb_adapter *adapter,
         /* VFs are limited to using the MTA hash table for their multicast
          * addresses */
         for (i = 0; i < n; i++)
-                vf_data->vf_mc_hashes[i] = hash_list[i];;
+                vf_data->vf_mc_hashes[i] = hash_list[i];
 
         /* Flush and reset the mta with the new values */
         igb_set_rx_mode(adapter->netdev);
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c
index da8d0a0ca94f..f2a197fd47a5 100644
--- a/drivers/net/ll_temac_main.c
+++ b/drivers/net/ll_temac_main.c
@@ -865,7 +865,7 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match)
         dcrs = dcr_resource_start(np, 0);
         if (dcrs == 0) {
                 dev_err(&op->dev, "could not get DMA register address\n");
-                goto nodev;;
+                goto nodev;
         }
         lp->sdma_dcrs = dcr_map(np, dcrs, dcr_resource_len(np, 0));
         dev_dbg(&op->dev, "DCR base: %x\n", dcrs);
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index fb65b427c692..1d0d4d9ab623 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -241,7 +241,7 @@ static int macb_mii_init(struct macb *bp)
         struct eth_platform_data *pdata;
         int err = -ENXIO, i;
 
-        /* Enable managment port */
+        /* Enable management port */
         macb_writel(bp, NCR, MACB_BIT(MPE));
 
         bp->mii_bus = mdiobus_alloc();
diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c
index bd0ac690d12c..aad3b370c562 100644
--- a/drivers/net/ni52.c
+++ b/drivers/net/ni52.c
@@ -615,10 +615,10 @@ static int init586(struct net_device *dev)
         /* addr_len |!src_insert |pre-len |loopback */
         writeb(0x2e, &cfg_cmd->adr_len);
         writeb(0x00, &cfg_cmd->priority);
-        writeb(0x60, &cfg_cmd->ifs);;
+        writeb(0x60, &cfg_cmd->ifs);
         writeb(0x00, &cfg_cmd->time_low);
         writeb(0xf2, &cfg_cmd->time_high);
-        writeb(0x00, &cfg_cmd->promisc);;
+        writeb(0x00, &cfg_cmd->promisc);
         if (dev->flags & IFF_ALLMULTI) {
                 int len = ((char __iomem *)p->iscp - (char __iomem *)ptr - 8) / 6;
                 if (num_addrs > len) {
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 220529257828..7783c5db81dc 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -2630,7 +2630,7 @@ static int ql_start_rx_ring(struct ql_adapter *qdev, struct rx_ring *rx_ring)
             FLAGS_LI;           /* Load irq delay values */
         if (rx_ring->lbq_len) {
                 cqicb->flags |= FLAGS_LL;       /* Load lbq values */
-                tmp = (u64)rx_ring->lbq_base_dma;;
+                tmp = (u64)rx_ring->lbq_base_dma;
                 base_indirect_ptr = (__le64 *) rx_ring->lbq_base_indirect;
                 page_entries = 0;
                 do {
@@ -2654,7 +2654,7 @@ static int ql_start_rx_ring(struct ql_adapter *qdev, struct rx_ring *rx_ring)
         }
         if (rx_ring->sbq_len) {
                 cqicb->flags |= FLAGS_LS;       /* Load sbq values */
-                tmp = (u64)rx_ring->sbq_base_dma;;
+                tmp = (u64)rx_ring->sbq_base_dma;
                 base_indirect_ptr = (__le64 *) rx_ring->sbq_base_indirect;
                 page_entries = 0;
                 do {
diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c
index bc98e7f69ee9..ede937ee50c7 100644
--- a/drivers/net/rionet.c
+++ b/drivers/net/rionet.c
@@ -72,7 +72,7 @@ static int rionet_check = 0;
 static int rionet_capable = 1;
 
 /*
- * This is a fast lookup table for for translating TX
+ * This is a fast lookup table for translating TX
  * Ethernet packets into a destination RIO device. It
  * could be made into a hash table to save memory depending
  * on system trade-offs.
diff --git a/drivers/net/skfp/pcmplc.c b/drivers/net/skfp/pcmplc.c
index f1df2ec8ad41..e6b33ee05ede 100644
--- a/drivers/net/skfp/pcmplc.c
+++ b/drivers/net/skfp/pcmplc.c
@@ -960,7 +960,7 @@ static void pcm_fsm(struct s_smc *smc, struct s_phy *phy, int cmd)
                         /*PC88b*/
                         if (!phy->cf_join) {
                                 phy->cf_join = TRUE ;
-                                queue_event(smc,EVENT_CFM,CF_JOIN+np) ; ;
+                                queue_event(smc,EVENT_CFM,CF_JOIN+np) ;
                         }
                         if (cmd == PC_JOIN)
                                 GO_STATE(PC8_ACTIVE) ;
diff --git a/drivers/net/skfp/pmf.c b/drivers/net/skfp/pmf.c
index 79e665e0853d..a320fdb3727d 100644
--- a/drivers/net/skfp/pmf.c
+++ b/drivers/net/skfp/pmf.c
@@ -807,9 +807,9 @@ void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para,
                                 mib_p->fddiPORTLerFlag ;
                         sp->p4050_pad = 0 ;
                         sp->p4050_cutoff =
-                                mib_p->fddiPORTLer_Cutoff ; ;
+                                mib_p->fddiPORTLer_Cutoff ;
                         sp->p4050_alarm =
-                                mib_p->fddiPORTLer_Alarm ; ;
+                                mib_p->fddiPORTLer_Alarm ;
                         sp->p4050_estimate =
                                 mib_p->fddiPORTLer_Estimate ;
                         sp->p4050_reject_ct =
@@ -829,7 +829,7 @@ void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para,
                         sp->p4051_porttype =
                                 mib_p->fddiPORTMy_Type ;
                         sp->p4051_connectstate =
-                                mib_p->fddiPORTConnectState ; ;
+                                mib_p->fddiPORTConnectState ;
                         sp->p4051_pc_neighbor =
                                 mib_p->fddiPORTNeighborType ;
                         sp->p4051_pc_withhold =
@@ -853,7 +853,7 @@ void smt_add_para(struct s_smc *smc, struct s_pcon *pcon, u_short para,
                         struct smt_p_4053       *sp ;
                         sp = (struct smt_p_4053 *) to ;
                         sp->p4053_multiple =
-                                mib_p->fddiPORTMultiple_P ; ;
+                                mib_p->fddiPORTMultiple_P ;
                         sp->p4053_availablepaths =
                                 mib_p->fddiPORTAvailablePaths ;
                         sp->p4053_currentpath =
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 62e852e21ab2..55bad4081966 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -215,7 +215,7 @@ static void skge_wol_init(struct skge_port *skge)
         if (skge->wol & WAKE_MAGIC)
                 ctrl |= WOL_CTL_ENA_PME_ON_MAGIC_PKT|WOL_CTL_ENA_MAGIC_PKT_UNIT;
         else
-                ctrl |= WOL_CTL_DIS_PME_ON_MAGIC_PKT|WOL_CTL_DIS_MAGIC_PKT_UNIT;;
+                ctrl |= WOL_CTL_DIS_PME_ON_MAGIC_PKT|WOL_CTL_DIS_MAGIC_PKT_UNIT;
 
         ctrl |= WOL_CTL_DIS_PME_ON_PATTERN|WOL_CTL_DIS_PATTERN_UNIT;
         skge_write16(hw, WOL_REGS(port, WOL_CTRL_STAT), ctrl);
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 4bb52e9cd371..15140f9f2e92 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -765,7 +765,7 @@ static void sky2_wol_init(struct sky2_port *sky2)
         if (sky2->wol & WAKE_MAGIC)
                 ctrl |= WOL_CTL_ENA_PME_ON_MAGIC_PKT|WOL_CTL_ENA_MAGIC_PKT_UNIT;
         else
-                ctrl |= WOL_CTL_DIS_PME_ON_MAGIC_PKT|WOL_CTL_DIS_MAGIC_PKT_UNIT;;
+                ctrl |= WOL_CTL_DIS_PME_ON_MAGIC_PKT|WOL_CTL_DIS_MAGIC_PKT_UNIT;
 
         ctrl |= WOL_CTL_DIS_PME_ON_PATTERN|WOL_CTL_DIS_PATTERN_UNIT;
         sky2_write16(hw, WOL_REGS(port, WOL_CTRL_STAT), ctrl);
diff --git a/drivers/net/vxge/vxge-config.h b/drivers/net/vxge/vxge-config.h
index 62779a520ca1..3e94f0ce0900 100644
--- a/drivers/net/vxge/vxge-config.h
+++ b/drivers/net/vxge/vxge-config.h
@@ -1541,7 +1541,7 @@ void vxge_hw_ring_rxd_1b_info_get(
         rxd_info->l4_cksum_valid =
                 (u32)VXGE_HW_RING_RXD_L4_CKSUM_CORRECT_GET(rxdp->control_0);
         rxd_info->l4_cksum =
-                (u32)VXGE_HW_RING_RXD_L4_CKSUM_GET(rxdp->control_0);;
+                (u32)VXGE_HW_RING_RXD_L4_CKSUM_GET(rxdp->control_0);
         rxd_info->frame =
                 (u32)VXGE_HW_RING_RXD_ETHER_ENCAP_GET(rxdp->control_0);
         rxd_info->proto =
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
index b378037a29b5..068d7a9d3e36 100644
--- a/drivers/net/vxge/vxge-main.c
+++ b/drivers/net/vxge/vxge-main.c
@@ -2350,7 +2350,7 @@ static int vxge_enable_msix(struct vxgedev *vdev)
         enum vxge_hw_status status;
         /* 0 - Tx, 1 - Rx  */
         int tim_msix_id[4];
-        int alarm_msix_id = 0, msix_intr_vect = 0;;
+        int alarm_msix_id = 0, msix_intr_vect = 0;
         vdev->intr_cnt = 0;
 
         /* allocate msix vectors */
diff --git a/drivers/net/wireless/ath/ath5k/reg.h b/drivers/net/wireless/ath/ath5k/reg.h
index debad07d9900..c63ea6afd96f 100644
--- a/drivers/net/wireless/ath/ath5k/reg.h
+++ b/drivers/net/wireless/ath/ath5k/reg.h
@@ -982,7 +982,7 @@
 #define AR5K_5414_CBCFG_BUF_DIS 0x10    /* Disable buffer */
 
 /*
- * PCI-E Power managment configuration
+ * PCI-E Power management configuration
  * and status register [5424+]
  */
 #define AR5K_PCIE_PM_CTL                0x4068                  /* Register address */
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index a3b36b3a9d67..cce188837d10 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -3330,7 +3330,7 @@ static void atmel_smooth_qual(struct atmel_private *priv)
         priv->wstats.qual.updated &= ~IW_QUAL_QUAL_INVALID;
 }
 
-/* deals with incoming managment frames. */
+/* deals with incoming management frames. */
 static void atmel_management_frame(struct atmel_private *priv,
                                    struct ieee80211_hdr *header,
                                    u16 frame_len, u8 rssi)
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
index 5e110a2328ae..4e79a9800134 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.c
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -368,7 +368,7 @@ error:
         return r;
 }
 
-/* MAC address: if custom mac addresses are to to be used CR_MAC_ADDR_P1 and
+/* MAC address: if custom mac addresses are to be used CR_MAC_ADDR_P1 and
  *              CR_MAC_ADDR_P2 must be overwritten
  */
 int zd_write_mac_addr(struct zd_chip *chip, const u8 *mac_addr)
diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
index b7e4cee24269..2766a6d3c2e9 100644
--- a/drivers/oprofile/oprofilefs.c
+++ b/drivers/oprofile/oprofilefs.c
@@ -35,7 +35,7 @@ static struct inode *oprofilefs_get_inode(struct super_block *sb, int mode)
 }
 
 
-static struct super_operations s_ops = {
+static const struct super_operations s_ops = {
         .statfs         = simple_statfs,
         .drop_inode     = generic_delete_inode,
 };
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index a45b0c0d574e..a6b4a5a53d40 100644
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -1266,7 +1266,7 @@ ccio_ioc_init(struct ioc *ioc)
         ** Hot-Plug/Removal of PCI cards. (aka PCI OLARD).
         */
 
-        iova_space_size = (u32) (num_physpages / count_parisc_driver(&ccio_driver));
+        iova_space_size = (u32) (totalram_pages / count_parisc_driver(&ccio_driver));
 
         /* limit IOVA space size to 1MB-1GB */
 
@@ -1305,7 +1305,7 @@ ccio_ioc_init(struct ioc *ioc)
 
         DBG_INIT("%s() hpa 0x%p mem %luMB IOV %dMB (%d bits)\n",
                         __func__, ioc->ioc_regs,
-                        (unsigned long) num_physpages >> (20 - PAGE_SHIFT),
+                        (unsigned long) totalram_pages >> (20 - PAGE_SHIFT),
                         iova_space_size>>20,
                         iov_order + PAGE_SHIFT);
 
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index 123d8fe3427d..57a6d19eba4c 100644
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -1390,7 +1390,7 @@ sba_ioc_init(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
         ** for DMA hints - ergo only 30 bits max.
         */
 
-        iova_space_size = (u32) (num_physpages/global_ioc_cnt);
+        iova_space_size = (u32) (totalram_pages/global_ioc_cnt);
 
         /* limit IOVA space size to 1MB-1GB */
         if (iova_space_size < (1 << (20 - PAGE_SHIFT))) {
@@ -1415,7 +1415,7 @@ sba_ioc_init(struct parisc_device *sba, struct ioc *ioc, int ioc_num)
         DBG_INIT("%s() hpa 0x%lx mem %ldMB IOV %dMB (%d bits)\n",
                         __func__,
                         ioc->ioc_hpa,
-                        (unsigned long) num_physpages >> (20 - PAGE_SHIFT),
+                        (unsigned long) totalram_pages >> (20 - PAGE_SHIFT),
                         iova_space_size>>20,
                         iov_order + PAGE_SHIFT);
 
diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c
index 7b424e0b0449..32c44040c1e8 100644
--- a/drivers/pcmcia/pcmcia_ioctl.c
+++ b/drivers/pcmcia/pcmcia_ioctl.c
@@ -27,6 +27,7 @@
 #include <linux/proc_fs.h>
 #include <linux/poll.h>
 #include <linux/pci.h>
+#include <linux/seq_file.h>
 #include <linux/smp_lock.h>
 #include <linux/workqueue.h>
 
@@ -105,37 +106,40 @@ static struct pcmcia_driver *get_pcmcia_driver(dev_info_t *dev_info)
 #ifdef CONFIG_PROC_FS
 static struct proc_dir_entry *proc_pccard = NULL;
 
-static int proc_read_drivers_callback(struct device_driver *driver, void *d)
+static int proc_read_drivers_callback(struct device_driver *driver, void *_m)
 {
-        char **p = d;
+        struct seq_file *m = _m;
         struct pcmcia_driver *p_drv = container_of(driver,
                                                    struct pcmcia_driver, drv);
 
-        *p += sprintf(*p, "%-24.24s 1 %d\n", p_drv->drv.name,
+        seq_printf(m, "%-24.24s 1 %d\n", p_drv->drv.name,
 #ifdef CONFIG_MODULE_UNLOAD
                       (p_drv->owner) ? module_refcount(p_drv->owner) : 1
 #else
                       1
 #endif
         );
-        d = (void *) p;
-
         return 0;
 }
 
-static int proc_read_drivers(char *buf, char **start, off_t pos,
-                             int count, int *eof, void *data)
+static int pccard_drivers_proc_show(struct seq_file *m, void *v)
 {
-        char *p = buf;
-        int rc;
-
-        rc = bus_for_each_drv(&pcmcia_bus_type, NULL,
-                              (void *) &p, proc_read_drivers_callback);
-        if (rc < 0)
-                return rc;
+        return bus_for_each_drv(&pcmcia_bus_type, NULL,
+                                m, proc_read_drivers_callback);
+}
 
-        return (p - buf);
+static int pccard_drivers_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, pccard_drivers_proc_show, NULL);
 }
+
+static const struct file_operations pccard_drivers_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = pccard_drivers_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
 #endif
 
 
@@ -1011,7 +1015,7 @@ void __init pcmcia_setup_ioctl(void) {
 #ifdef CONFIG_PROC_FS
         proc_pccard = proc_mkdir("bus/pccard", NULL);
         if (proc_pccard)
-                create_proc_read_entry("drivers",0,proc_pccard,proc_read_drivers,NULL);
+                proc_create("drivers", 0, proc_pccard, &pccard_drivers_proc_fops);
 #endif
 }
 
diff --git a/drivers/pcmcia/sa1100_jornada720.c b/drivers/pcmcia/sa1100_jornada720.c
index 57ca085473d5..7eedb42f800c 100644
--- a/drivers/pcmcia/sa1100_jornada720.c
+++ b/drivers/pcmcia/sa1100_jornada720.c
@@ -16,89 +16,103 @@
 
 #include "sa1111_generic.h"
 
-#define SOCKET0_POWER   GPIO_GPIO0
-#define SOCKET0_3V      GPIO_GPIO2
-#define SOCKET1_POWER   (GPIO_GPIO1 | GPIO_GPIO3)
-#warning *** Does SOCKET1_3V actually do anything?
+/* Does SOCKET1_3V actually do anything? */
+#define SOCKET0_POWER   GPIO_GPIO0
+#define SOCKET0_3V      GPIO_GPIO2
+#define SOCKET1_POWER   (GPIO_GPIO1 | GPIO_GPIO3)
 #define SOCKET1_3V      GPIO_GPIO3
 
 static int jornada720_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 {
-  /*
-   * What is all this crap for?
-   */
-  GRER |= 0x00000002;
-  /* Set GPIO_A<3:1> to be outputs for PCMCIA/CF power controller: */
-  sa1111_set_io_dir(SA1111_DEV(skt->dev), GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0, 0);
-  sa1111_set_io(SA1111_DEV(skt->dev), GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0);
-  sa1111_set_sleep_io(SA1111_DEV(skt->dev), GPIO_A0|GPIO_A1|GPIO_A2|GPIO_A3, 0);
-
-  return sa1111_pcmcia_hw_init(skt);
+        unsigned int pin = GPIO_A0 | GPIO_A1 | GPIO_A2 | GPIO_A3;
+
+        /*
+        * What is all this crap for?
+        */
+        GRER |= 0x00000002;
+        /* Set GPIO_A<3:1> to be outputs for PCMCIA/CF power controller: */
+        sa1111_set_io_dir(SA1111_DEV(skt->dev), pin, 0, 0);
+        sa1111_set_io(SA1111_DEV(skt->dev), pin, 0);
+        sa1111_set_sleep_io(SA1111_DEV(skt->dev), pin, 0);
+
+        return sa1111_pcmcia_hw_init(skt);
 }
 
 static int
 jornada720_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_t *state)
 {
-  unsigned int pa_dwr_mask, pa_dwr_set;
-  int ret;
-
-printk("%s(): config socket %d vcc %d vpp %d\n", __func__,
-        skt->nr, state->Vcc, state->Vpp);
-
-  switch (skt->nr) {
-  case 0:
-    pa_dwr_mask = SOCKET0_POWER | SOCKET0_3V;
-
-    switch (state->Vcc) {
-    default:
-    case 0:     pa_dwr_set = 0;                                 break;
-    case 33:    pa_dwr_set = SOCKET0_POWER | SOCKET0_3V;        break;
-    case 50:    pa_dwr_set = SOCKET0_POWER;                     break;
-    }
-    break;
-
-  case 1:
-    pa_dwr_mask = SOCKET1_POWER;
-
-    switch (state->Vcc) {
-    default:
-    case 0:     pa_dwr_set = 0;                                 break;
-    case 33:    pa_dwr_set = SOCKET1_POWER;                     break;
-    case 50:    pa_dwr_set = SOCKET1_POWER;                     break;
-    }
-    break;
-
-  default:
-    return -1;
-  }
-
-  if (state->Vpp != state->Vcc && state->Vpp != 0) {
-    printk(KERN_ERR "%s(): slot cannot support VPP %u\n",
-           __func__, state->Vpp);
-    return -1;
-  }
-
-  ret = sa1111_pcmcia_configure_socket(skt, state);
-  if (ret == 0) {
-    unsigned long flags;
-
-    local_irq_save(flags);
-    sa1111_set_io(SA1111_DEV(skt->dev), pa_dwr_mask, pa_dwr_set);
-    local_irq_restore(flags);
-  }
-
-  return ret;
+        unsigned int pa_dwr_mask, pa_dwr_set;
+        int ret;
+
+        printk(KERN_INFO "%s(): config socket %d vcc %d vpp %d\n", __func__,
+                skt->nr, state->Vcc, state->Vpp);
+
+        switch (skt->nr) {
+        case 0:
+                pa_dwr_mask = SOCKET0_POWER | SOCKET0_3V;
+
+                switch (state->Vcc) {
+                default:
+                case  0:
+                        pa_dwr_set = 0;
+                        break;
+                case 33:
+                        pa_dwr_set = SOCKET0_POWER | SOCKET0_3V;
+                        break;
+                case 50:
+                        pa_dwr_set = SOCKET0_POWER;
+                        break;
+                }
+                break;
+
+        case 1:
+                pa_dwr_mask = SOCKET1_POWER;
+
+                switch (state->Vcc) {
+                default:
+                case 0:
+                        pa_dwr_set = 0;
+                        break;
+                case 33:
+                        pa_dwr_set = SOCKET1_POWER;
+                        break;
+                case 50:
+                        pa_dwr_set = SOCKET1_POWER;
+                        break;
+                }
+                break;
+
+        default:
+                return -1;
+        }
+
+        if (state->Vpp != state->Vcc && state->Vpp != 0) {
+                printk(KERN_ERR "%s(): slot cannot support VPP %u\n",
+                        __func__, state->Vpp);
+                return -EPERM;
+        }
+
+        ret = sa1111_pcmcia_configure_socket(skt, state);
+        if (ret == 0) {
+                unsigned long flags;
+
+                local_irq_save(flags);
+                sa1111_set_io(SA1111_DEV(skt->dev), pa_dwr_mask, pa_dwr_set);
+                local_irq_restore(flags);
+        }
+
+        return ret;
 }
 
 static struct pcmcia_low_level jornada720_pcmcia_ops = {
-  .owner                = THIS_MODULE,
-  .hw_init              = jornada720_pcmcia_hw_init,
-  .hw_shutdown          = sa1111_pcmcia_hw_shutdown,
-  .socket_state         = sa1111_pcmcia_socket_state,
-  .configure_socket     = jornada720_pcmcia_configure_socket,
-
-  .socket_init          = sa1111_pcmcia_socket_init,
-  .socket_suspend       = sa1111_pcmcia_socket_suspend,
+        .owner                  = THIS_MODULE,
+        .hw_init                = jornada720_pcmcia_hw_init,
+        .hw_shutdown            = sa1111_pcmcia_hw_shutdown,
+        .socket_state           = sa1111_pcmcia_socket_state,
+        .configure_socket       = jornada720_pcmcia_configure_socket,
+
+        .socket_init            = sa1111_pcmcia_socket_init,
+        .socket_suspend         = sa1111_pcmcia_socket_suspend,
 };
 
 int __devinit pcmcia_jornada720_init(struct device *dev)
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c
index 737fe5d87c40..b459e87a30ac 100644
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -717,7 +717,7 @@ static void yenta_free_resources(struct yenta_socket *socket)
 /*
  * Close it down - release our resources and go home..
  */
-static void yenta_close(struct pci_dev *dev)
+static void __devexit yenta_close(struct pci_dev *dev)
 {
         struct yenta_socket *sock = pci_get_drvdata(dev);
 
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index 527ee764c93f..cd11b113494f 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -135,6 +135,15 @@ static int pnp_device_remove(struct device *dev)
         return 0;
 }
 
+static void pnp_device_shutdown(struct device *dev)
+{
+        struct pnp_dev *pnp_dev = to_pnp_dev(dev);
+        struct pnp_driver *drv = pnp_dev->driver;
+
+        if (drv && drv->shutdown)
+                drv->shutdown(pnp_dev);
+}
+
 static int pnp_bus_match(struct device *dev, struct device_driver *drv)
 {
         struct pnp_dev *pnp_dev = to_pnp_dev(dev);
@@ -203,6 +212,7 @@ struct bus_type pnp_bus_type = {
         .match   = pnp_bus_match,
         .probe   = pnp_device_probe,
         .remove  = pnp_device_remove,
+        .shutdown = pnp_device_shutdown,
         .suspend = pnp_bus_suspend,
         .resume  = pnp_bus_resume,
         .dev_attrs = pnp_interface_attrs,
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index bd1ce8e2bc18..0587d53987fe 100644
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -430,7 +430,7 @@ fail:
 
 static int __exit omap_rtc_remove(struct platform_device *pdev)
 {
-        struct rtc_device       *rtc = platform_get_drvdata(pdev);;
+        struct rtc_device       *rtc = platform_get_drvdata(pdev);
 
         device_init_wakeup(&pdev->dev, 0);
 
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index e109da4583a8..dad0449475b6 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -2146,7 +2146,7 @@ static int dasd_getgeo(struct block_device *bdev, struct hd_geometry *geo)
         return 0;
 }
 
-struct block_device_operations
+const struct block_device_operations
 dasd_device_operations = {
         .owner          = THIS_MODULE,
         .open           = dasd_open,
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index a1ce573648a2..bd9fe2e36dce 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -706,7 +706,7 @@ static int dasd_eckd_generate_uid(struct dasd_device *device,
                sizeof(uid->serial) - 1);
         EBCASC(uid->serial, sizeof(uid->serial) - 1);
         uid->ssid = private->gneq->subsystemID;
-        uid->real_unit_addr = private->ned->unit_addr;;
+        uid->real_unit_addr = private->ned->unit_addr;
         if (private->sneq) {
                 uid->type = private->sneq->sua_flags;
                 if (uid->type == UA_BASE_PAV_ALIAS)
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index 5e47a1ee52b9..8afd9fa00875 100644
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -540,7 +540,7 @@ dasd_check_blocksize(int bsize)
 extern debug_info_t *dasd_debug_area;
 extern struct dasd_profile_info_t dasd_global_profile;
 extern unsigned int dasd_profile_level;
-extern struct block_device_operations dasd_device_operations;
+extern const struct block_device_operations dasd_device_operations;
 
 extern struct kmem_cache *dasd_page_cache;
 
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index d34617682a62..f76f4bd82b9f 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -34,7 +34,7 @@ static int dcssblk_direct_access(struct block_device *bdev, sector_t secnum,
 static char dcssblk_segments[DCSSBLK_PARM_LEN] = "\0";
 
 static int dcssblk_major;
-static struct block_device_operations dcssblk_devops = {
+static const struct block_device_operations dcssblk_devops = {
         .owner          = THIS_MODULE,
         .open           = dcssblk_open,
         .release        = dcssblk_release,
diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c
index ee604e92a5fa..116d1b3eeb15 100644
--- a/drivers/s390/block/xpram.c
+++ b/drivers/s390/block/xpram.c
@@ -244,7 +244,7 @@ static int xpram_getgeo(struct block_device *bdev, struct hd_geometry *geo)
         return 0;
 }
 
-static struct block_device_operations xpram_devops =
+static const struct block_device_operations xpram_devops =
 {
         .owner  = THIS_MODULE,
         .getgeo = xpram_getgeo,
diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c
index 4cb9e70507ab..64f57ef2763c 100644
--- a/drivers/s390/char/tape_block.c
+++ b/drivers/s390/char/tape_block.c
@@ -50,7 +50,7 @@ static int tapeblock_ioctl(struct block_device *, fmode_t, unsigned int,
 static int tapeblock_medium_changed(struct gendisk *);
 static int tapeblock_revalidate_disk(struct gendisk *);
 
-static struct block_device_operations tapeblock_fops = {
+static const struct block_device_operations tapeblock_fops = {
         .owner           = THIS_MODULE,
         .open            = tapeblock_open,
         .release         = tapeblock_release,
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index a4b2c576144b..c84eadd3602a 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -2113,7 +2113,7 @@ static ssize_t remove_write (struct device_driver *drv,
         IUCV_DBF_TEXT(trace, 3, __func__);
 
         if (count >= IFNAMSIZ)
-                count = IFNAMSIZ - 1;;
+                count = IFNAMSIZ - 1;
 
         for (i = 0, p = buf; i < count && *p; i++, p++) {
                 if (*p == '\n' || *p == ' ')
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index 3ff726afafc6..0e1a34627a2e 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -102,7 +102,7 @@ static int zfcp_scsi_queuecommand(struct scsi_cmnd *scpnt,
         if (unlikely((status & ZFCP_STATUS_COMMON_ERP_FAILED) ||
                      !(status & ZFCP_STATUS_COMMON_RUNNING))) {
                 zfcp_scsi_command_fail(scpnt, DID_ERROR);
-                return 0;;
+                return 0;
         }
 
         ret = zfcp_fsf_send_fcp_command_task(unit, scpnt);
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c
index 6d4651684688..869a30b49edc 100644
--- a/drivers/sbus/char/jsflash.c
+++ b/drivers/sbus/char/jsflash.c
@@ -452,7 +452,7 @@ static const struct file_operations jsf_fops = {
 
 static struct miscdevice jsf_dev = { JSF_MINOR, "jsflash", &jsf_fops };
 
-static struct block_device_operations jsfd_fops = {
+static const struct block_device_operations jsfd_fops = {
         .owner =        THIS_MODULE,
 };
 
diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c
index e6f2bb7365e6..8dfb59d58992 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_core.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_core.c
@@ -5223,7 +5223,7 @@ ahc_chip_init(struct ahc_softc *ahc)
 
         /*
          * Setup the allowed SCSI Sequences based on operational mode.
-         * If we are a target, we'll enalbe select in operations once
+         * If we are a target, we'll enable select in operations once
          * we've had a lun enabled.
          */
         scsiseq_template = ENSELO|ENAUTOATNO|ENAUTOATNP;
diff --git a/drivers/scsi/bnx2i/bnx2i_hwi.c b/drivers/scsi/bnx2i/bnx2i_hwi.c
index 906cef5cda86..41e1b0e7e2ef 100644
--- a/drivers/scsi/bnx2i/bnx2i_hwi.c
+++ b/drivers/scsi/bnx2i/bnx2i_hwi.c
@@ -1340,7 +1340,7 @@ static int bnx2i_process_login_resp(struct iscsi_session *session,
         resp_hdr->opcode = login->op_code;
         resp_hdr->flags = login->response_flags;
         resp_hdr->max_version = login->version_max;
-        resp_hdr->active_version = login->version_active;;
+        resp_hdr->active_version = login->version_active;
         resp_hdr->hlength = 0;
 
         hton24(resp_hdr->dlength, login->data_length);
diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index 9df7ed38e1be..9a1bd9534d74 100644
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -1207,7 +1207,7 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode,
                 vport->ct_flags &= ~FC_CT_RFF_ID;
                 CtReq->CommandResponse.bits.CmdRsp =
                     be16_to_cpu(SLI_CTNS_RFF_ID);
-                CtReq->un.rff.PortId = cpu_to_be32(vport->fc_myDID);;
+                CtReq->un.rff.PortId = cpu_to_be32(vport->fc_myDID);
                 CtReq->un.rff.fbits = FC4_FEATURE_INIT;
                 CtReq->un.rff.type_code = FC_FCP_DATA;
                 cmpl = lpfc_cmpl_ct_cmd_rff_id;
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c
index 7dc3d1894b1a..a39addc3a596 100644
--- a/drivers/scsi/megaraid/megaraid_sas.c
+++ b/drivers/scsi/megaraid/megaraid_sas.c
@@ -718,7 +718,7 @@ megasas_build_dcdb(struct megasas_instance *instance, struct scsi_cmnd *scp,
  * megasas_build_ldio - Prepares IOs to logical devices
  * @instance:           Adapter soft state
  * @scp:                SCSI command
- * @cmd:                Command to to be prepared
+ * @cmd:                Command to be prepared
  *
  * Frames (and accompanying SGLs) for regular SCSI IOs use this function.
  */
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 40e3cafb3a9c..83c8b5e4fc8b 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -1422,7 +1422,7 @@ static void qla4xxx_slave_destroy(struct scsi_device *sdev)
 /**
  * qla4xxx_del_from_active_array - returns an active srb
  * @ha: Pointer to host adapter structure.
- * @index: index into to the active_array
+ * @index: index into the active_array
  *
  * This routine removes and returns the srb at the specified index
  **/
@@ -1500,7 +1500,7 @@ static int qla4xxx_wait_for_hba_online(struct scsi_qla_host *ha)
 
 /**
  * qla4xxx_eh_wait_for_commands - wait for active cmds to finish.
- * @ha: pointer to to HBA
+ * @ha: pointer to HBA
  * @t: target id
  * @l: lun id
  *
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index a89c421dab51..8dd96dcd716c 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -956,7 +956,7 @@ static int sd_compat_ioctl(struct block_device *bdev, fmode_t mode,
 }
 #endif
 
-static struct block_device_operations sd_fops = {
+static const struct block_device_operations sd_fops = {
         .owner                  = THIS_MODULE,
         .open                   = sd_open,
         .release                = sd_release,
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index cce0fe4c8a3b..eb61f7a70e1d 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -525,7 +525,7 @@ static int sr_block_media_changed(struct gendisk *disk)
         return cdrom_media_changed(&cd->cdi);
 }
 
-static struct block_device_operations sr_bdops =
+static const struct block_device_operations sr_bdops =
 {
         .owner          = THIS_MODULE,
         .open           = sr_block_open,
diff --git a/drivers/spi/omap_uwire.c b/drivers/spi/omap_uwire.c
index 8980a5640bd9..e75ba9b28898 100644
--- a/drivers/spi/omap_uwire.c
+++ b/drivers/spi/omap_uwire.c
@@ -213,7 +213,7 @@ static int uwire_txrx(struct spi_device *spi, struct spi_transfer *t)
         unsigned        bits = ust->bits_per_word;
         unsigned        bytes;
         u16             val, w;
-        int             status = 0;;
+        int             status = 0;
 
         if (!t->tx_buf && !t->rx_buf)
                 return 0;
diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c
index 3f3119d760db..6ba8aece90b5 100644
--- a/drivers/spi/spi_s3c24xx.c
+++ b/drivers/spi/spi_s3c24xx.c
@@ -388,7 +388,7 @@ static int __init s3c24xx_spi_probe(struct platform_device *pdev)
 
  err_no_iores:
  err_no_pdata:
-        spi_master_put(hw->master);;
+        spi_master_put(hw->master);
 
  err_nomem:
         return err;
diff --git a/drivers/staging/rt2860/rtmp.h b/drivers/staging/rt2860/rtmp.h
index 3f498f6f3ff6..90fd40f24734 100644
--- a/drivers/staging/rt2860/rtmp.h
+++ b/drivers/staging/rt2860/rtmp.h
@@ -2060,7 +2060,7 @@ typedef struct _STA_ADMIN_CONFIG {
     BOOLEAN             AdhocBGJoined;          // Indicate Adhoc B/G Join.
     BOOLEAN             Adhoc20NJoined;         // Indicate Adhoc 20MHz N Join.
 #endif
-        // New for WPA, windows want us to to keep association information and
+        // New for WPA, windows want us to keep association information and
         // Fixed IEs from last association response
         NDIS_802_11_ASSOCIATION_INFORMATION     AssocInfo;
         USHORT       ReqVarIELen;                // Length of next VIE include EID & Length
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index ba589d4ca8bc..8c64c018b676 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -506,8 +506,6 @@ static int wdm_open(struct inode *inode, struct file *file)
         desc = usb_get_intfdata(intf);
         if (test_bit(WDM_DISCONNECTING, &desc->flags))
                 goto out;
-
-        ;
         file->private_data = desc;
 
         rv = usb_autopm_get_interface(desc->intf);
diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c
index ffe75e83787c..97b40ce133f0 100644
--- a/drivers/usb/core/inode.c
+++ b/drivers/usb/core/inode.c
@@ -48,7 +48,6 @@
 #define USBFS_DEFAULT_BUSMODE (S_IXUGO | S_IRUGO)
 #define USBFS_DEFAULT_LISTMODE S_IRUGO
 
-static struct super_operations usbfs_ops;
 static const struct file_operations default_file_operations;
 static struct vfsmount *usbfs_mount;
 static int usbfs_mount_count;   /* = 0 */
@@ -449,7 +448,7 @@ static const struct file_operations default_file_operations = {
         .llseek =       default_file_lseek,
 };
 
-static struct super_operations usbfs_ops = {
+static const struct super_operations usbfs_ops = {
         .statfs =       simple_statfs,
         .drop_inode =   generic_delete_inode,
         .remount_fs =   remount,
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index 7d33f50b5874..c44367fea185 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -2033,7 +2033,7 @@ gadgetfs_create_file (struct super_block *sb, char const *name,
         return inode;
 }
 
-static struct super_operations gadget_fs_operations = {
+static const struct super_operations gadget_fs_operations = {
         .statfs =       simple_statfs,
         .drop_inode =   generic_delete_inode,
 };
diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index c2f1b7df918c..b5b83c43898a 100644
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -242,7 +242,7 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
          * System suspend currently expects to be able to suspend the entire
          * device tree, device-at-a-time.  If we failed selective suspend
          * reports, system suspend would fail; so the root hub code must claim
-         * success.  That's lying to usbcore, and it matters for for runtime
+         * success.  That's lying to usbcore, and it matters for runtime
          * PM scenarios with selective suspend and remote wakeup...
          */
         if (ehci->no_selective_suspend && device_can_wakeup(&pdev->dev))
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index 2bfff30f4704..48b9e889a18b 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -37,7 +37,7 @@ typedef __u16 __bitwise __hc16;
 #define __hc16  __le16
 #endif
 
-/* statistics can be kept for for tuning/monitoring */
+/* statistics can be kept for tuning/monitoring */
 struct ehci_stats {
         /* irq usage */
         unsigned long           normal;
diff --git a/drivers/usb/host/ohci-q.c b/drivers/usb/host/ohci-q.c
index c2d80f80448b..16fecb8ecc39 100644
--- a/drivers/usb/host/ohci-q.c
+++ b/drivers/usb/host/ohci-q.c
@@ -418,7 +418,7 @@ static struct ed *ed_get (
                 is_out = !(ep->desc.bEndpointAddress & USB_DIR_IN);
 
                 /* FIXME usbcore changes dev->devnum before SET_ADDRESS
-                 * suceeds ... otherwise we wouldn't need "pipe".
+                 * succeeds ... otherwise we wouldn't need "pipe".
                  */
                 info = usb_pipedevice (pipe);
                 ed->type = usb_pipetype(pipe);
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index d31d32206ba3..ffe1625d4e1b 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1150,7 +1150,7 @@ void xhci_dbg_cmd_ptrs(struct xhci_hcd *xhci);
 void xhci_dbg_ring_ptrs(struct xhci_hcd *xhci, struct xhci_ring *ring);
 void xhci_dbg_ctx(struct xhci_hcd *xhci, struct xhci_container_ctx *ctx, unsigned int last_ep);
 
-/* xHCI memory managment */
+/* xHCI memory management */
 void xhci_mem_cleanup(struct xhci_hcd *xhci);
 int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags);
 void xhci_free_virt_device(struct xhci_hcd *xhci, int slot_id);
diff --git a/drivers/usb/serial/cypress_m8.h b/drivers/usb/serial/cypress_m8.h
index e772b01ac3ac..1fd360e04065 100644
--- a/drivers/usb/serial/cypress_m8.h
+++ b/drivers/usb/serial/cypress_m8.h
@@ -57,7 +57,7 @@
 #define UART_RI         0x10    /* ring indicator - modem - device to host */
 #define UART_CD         0x40    /* carrier detect - modem - device to host */
 #define CYP_ERROR       0x08    /* received from input report - device to host */
-/* Note - the below has nothing to to with the "feature report" reset */
+/* Note - the below has nothing to do with the "feature report" reset */
 #define CONTROL_RESET   0x08    /* sent with output report - host to device */
 
 /* End of RS-232 protocol definitions */
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index dc0f832657e6..b97960ac92f2 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -2540,7 +2540,7 @@ static int calc_baud_rate_divisor(int baudrate, int *divisor)
 
 /*****************************************************************************
  * send_cmd_write_uart_register
- *  this function builds up a uart register message and sends to to the device.
+ *  this function builds up a uart register message and sends to the device.
  *****************************************************************************/
 static int send_cmd_write_uart_register(struct edgeport_port *edge_port,
                                                 __u8 regNum, __u8 regValue)
diff --git a/drivers/usb/serial/kl5kusb105.c b/drivers/usb/serial/kl5kusb105.c
index a61673133d7d..f7373371b137 100644
--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@ -38,7 +38,7 @@
  *   0.3a - implemented pools of write URBs
  *   0.3  - alpha version for public testing
  *   0.2  - TIOCMGET works, so autopilot(1) can be used!
- *   0.1  - can be used to to pilot-xfer -p /dev/ttyUSB0 -l
+ *   0.1  - can be used to do pilot-xfer -p /dev/ttyUSB0 -l
  *
  *   The driver skeleton is mainly based on mct_u232.c and various other
  *   pieces of code shamelessly copied from the drivers/usb/serial/ directory.
diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c
index 61e7c40b94fb..1e58220403d1 100644
--- a/drivers/usb/serial/spcp8x5.c
+++ b/drivers/usb/serial/spcp8x5.c
@@ -544,7 +544,7 @@ static void spcp8x5_set_termios(struct tty_struct *tty,
         }
 
         /* Set Baud Rate */
-        baud = tty_get_baud_rate(tty);;
+        baud = tty_get_baud_rate(tty);
         switch (baud) {
         case 300:       buf[0] = 0x00;  break;
         case 600:       buf[0] = 0x01;  break;
diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
index 586d350cdb4d..d6bea3e0b54a 100644
--- a/drivers/usb/wusbcore/wa-hc.h
+++ b/drivers/usb/wusbcore/wa-hc.h
@@ -47,7 +47,7 @@
  *             to an endpoint on a WUSB device that is connected to a
  *             HWA RC.
  *
- *  xfer       Transfer managment -- this is all the code that gets a
+ *  xfer       Transfer management -- this is all the code that gets a
  *             buffer and pushes it to a device (or viceversa). *
  *
  * Some day a lot of this code will be shared between this driver and
diff --git a/drivers/uwb/i1480/i1480u-wlp/netdev.c b/drivers/uwb/i1480/i1480u-wlp/netdev.c
index 73055530e60f..b236e6969942 100644
--- a/drivers/uwb/i1480/i1480u-wlp/netdev.c
+++ b/drivers/uwb/i1480/i1480u-wlp/netdev.c
@@ -214,7 +214,7 @@ int i1480u_open(struct net_device *net_dev)
 
         netif_wake_queue(net_dev);
 #ifdef i1480u_FLOW_CONTROL
-        result = usb_submit_urb(i1480u->notif_urb, GFP_KERNEL);;
+        result = usb_submit_urb(i1480u->notif_urb, GFP_KERNEL);
         if (result < 0) {
                 dev_err(dev, "Can't submit notification URB: %d\n", result);
                 goto error_notif_urb_submit;
diff --git a/drivers/video/cfbcopyarea.c b/drivers/video/cfbcopyarea.c
index df03f3776dcc..79e5f40e6486 100644
--- a/drivers/video/cfbcopyarea.c
+++ b/drivers/video/cfbcopyarea.c
@@ -114,7 +114,7 @@ bitcpy(struct fb_info *p, unsigned long __iomem *dst, int dst_idx,
                                 d0 >>= right;
                         } else if (src_idx+n <= bits) {
                                 // Single source word
-                                d0 <<= left;;
+                                d0 <<= left;
                         } else {
                                 // 2 source words
                                 d1 = FB_READL(src + 1);
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
index 30ae3022f633..66358fa825f3 100644
--- a/drivers/video/imxfb.c
+++ b/drivers/video/imxfb.c
@@ -710,7 +710,7 @@ static int __init imxfb_probe(struct platform_device *pdev)
 
         fbi->clk = clk_get(&pdev->dev, NULL);
         if (IS_ERR(fbi->clk)) {
-                ret = PTR_ERR(fbi->clk);;
+                ret = PTR_ERR(fbi->clk);
                 dev_err(&pdev->dev, "unable to get clock: %d\n", ret);
                 goto failed_getclock;
         }
diff --git a/drivers/video/omap/lcd_h3.c b/drivers/video/omap/lcd_h3.c
index 2486237ebba5..417ae5efa8bb 100644
--- a/drivers/video/omap/lcd_h3.c
+++ b/drivers/video/omap/lcd_h3.c
@@ -124,12 +124,12 @@ struct platform_driver h3_panel_driver = {
         },
 };
 
-static int h3_panel_drv_init(void)
+static int __init h3_panel_drv_init(void)
 {
         return platform_driver_register(&h3_panel_driver);
 }
 
-static void h3_panel_drv_cleanup(void)
+static void __exit h3_panel_drv_cleanup(void)
 {
         platform_driver_unregister(&h3_panel_driver);
 }
diff --git a/drivers/video/omap/lcd_h4.c b/drivers/video/omap/lcd_h4.c
index 6ff56430341b..0c398bda7601 100644
--- a/drivers/video/omap/lcd_h4.c
+++ b/drivers/video/omap/lcd_h4.c
@@ -102,12 +102,12 @@ static struct platform_driver h4_panel_driver = {
         },
 };
 
-static int h4_panel_drv_init(void)
+static int __init h4_panel_drv_init(void)
 {
         return platform_driver_register(&h4_panel_driver);
 }
 
-static void h4_panel_drv_cleanup(void)
+static void __exit h4_panel_drv_cleanup(void)
 {
         platform_driver_unregister(&h4_panel_driver);
 }
diff --git a/drivers/video/omap/lcd_inn1510.c b/drivers/video/omap/lcd_inn1510.c
index 6953ed4b5820..cdbd8bb607be 100644
--- a/drivers/video/omap/lcd_inn1510.c
+++ b/drivers/video/omap/lcd_inn1510.c
@@ -109,12 +109,12 @@ struct platform_driver innovator1510_panel_driver = {
         },
 };
 
-static int innovator1510_panel_drv_init(void)
+static int __init innovator1510_panel_drv_init(void)
 {
         return platform_driver_register(&innovator1510_panel_driver);
 }
 
-static void innovator1510_panel_drv_cleanup(void)
+static void __exit innovator1510_panel_drv_cleanup(void)
 {
         platform_driver_unregister(&innovator1510_panel_driver);
 }
diff --git a/drivers/video/omap/lcd_inn1610.c b/drivers/video/omap/lcd_inn1610.c
index 4c4f7ee6d733..268f7f808a4e 100644
--- a/drivers/video/omap/lcd_inn1610.c
+++ b/drivers/video/omap/lcd_inn1610.c
@@ -133,12 +133,12 @@ struct platform_driver innovator1610_panel_driver = {
         },
 };
 
-static int innovator1610_panel_drv_init(void)
+static int __init innovator1610_panel_drv_init(void)
 {
         return platform_driver_register(&innovator1610_panel_driver);
 }
 
-static void innovator1610_panel_drv_cleanup(void)
+static void __exit innovator1610_panel_drv_cleanup(void)
 {
         platform_driver_unregister(&innovator1610_panel_driver);
 }
diff --git a/drivers/video/omap/lcd_osk.c b/drivers/video/omap/lcd_osk.c
index 379c96d36da5..b3fa88bc6269 100644
--- a/drivers/video/omap/lcd_osk.c
+++ b/drivers/video/omap/lcd_osk.c
@@ -127,12 +127,12 @@ struct platform_driver osk_panel_driver = {
         },
 };
 
-static int osk_panel_drv_init(void)
+static int __init osk_panel_drv_init(void)
 {
         return platform_driver_register(&osk_panel_driver);
 }
 
-static void osk_panel_drv_cleanup(void)
+static void __exit osk_panel_drv_cleanup(void)
 {
         platform_driver_unregister(&osk_panel_driver);
 }
diff --git a/drivers/video/omap/lcd_palmte.c b/drivers/video/omap/lcd_palmte.c
index 218317366e6e..4bf3c79f3cc7 100644
--- a/drivers/video/omap/lcd_palmte.c
+++ b/drivers/video/omap/lcd_palmte.c
@@ -108,12 +108,12 @@ struct platform_driver palmte_panel_driver = {
         },
 };
 
-static int palmte_panel_drv_init(void)
+static int __init palmte_panel_drv_init(void)
 {
         return platform_driver_register(&palmte_panel_driver);
 }
 
-static void palmte_panel_drv_cleanup(void)
+static void __exit palmte_panel_drv_cleanup(void)
 {
         platform_driver_unregister(&palmte_panel_driver);
 }
diff --git a/drivers/video/omap/lcd_palmtt.c b/drivers/video/omap/lcd_palmtt.c
index 57b0f6cf6a5a..48ea1f9f2cbf 100644
--- a/drivers/video/omap/lcd_palmtt.c
+++ b/drivers/video/omap/lcd_palmtt.c
@@ -113,12 +113,12 @@ struct platform_driver palmtt_panel_driver = {
         },
 };
 
-static int palmtt_panel_drv_init(void)
+static int __init palmtt_panel_drv_init(void)
 {
         return platform_driver_register(&palmtt_panel_driver);
 }
 
-static void palmtt_panel_drv_cleanup(void)
+static void __exit palmtt_panel_drv_cleanup(void)
 {
         platform_driver_unregister(&palmtt_panel_driver);
 }
diff --git a/drivers/video/omap/lcd_palmz71.c b/drivers/video/omap/lcd_palmz71.c
index d33d78b11723..0697d29b4d3b 100644
--- a/drivers/video/omap/lcd_palmz71.c
+++ b/drivers/video/omap/lcd_palmz71.c
@@ -109,12 +109,12 @@ struct platform_driver palmz71_panel_driver = {
         },
 };
 
-static int palmz71_panel_drv_init(void)
+static int __init palmz71_panel_drv_init(void)
 {
         return platform_driver_register(&palmz71_panel_driver);
 }
 
-static void palmz71_panel_drv_cleanup(void)
+static void __exit palmz71_panel_drv_cleanup(void)
 {
         platform_driver_unregister(&palmz71_panel_driver);
 }
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index 7da0027e2409..5ffca2adc6a8 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -1119,7 +1119,7 @@ int __init s3c2410fb_init(void)
         int ret = platform_driver_register(&s3c2410fb_driver);
 
         if (ret == 0)
-                ret = platform_driver_register(&s3c2412fb_driver);;
+                ret = platform_driver_register(&s3c2412fb_driver);
 
         return ret;
 }
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c
index f5bbd9e83416..d31505b6f7a4 100644
--- a/drivers/xen/balloon.c
+++ b/drivers/xen/balloon.c
@@ -96,11 +96,7 @@ static struct balloon_stats balloon_stats;
 /* We increase/decrease in batches which fit in a page */
 static unsigned long frame_list[PAGE_SIZE / sizeof(unsigned long)];
 
-/* VM /proc information for memory */
-extern unsigned long totalram_pages;
-
 #ifdef CONFIG_HIGHMEM
-extern unsigned long totalhigh_pages;
 #define inc_totalhigh_pages() (totalhigh_pages++)
 #define dec_totalhigh_pages() (totalhigh_pages--)
 #else
@@ -214,7 +210,7 @@ static int increase_reservation(unsigned long nr_pages)
         page = balloon_first_page();
         for (i = 0; i < nr_pages; i++) {
                 BUG_ON(page == NULL);
-                frame_list[i] = page_to_pfn(page);;
+                frame_list[i] = page_to_pfn(page);
                 page = balloon_next_page(page);
         }