38 files changed, 50 insertions, 60 deletions

diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c
index 1f3c1a7d132a..38a2d0631882 100644
--- a/drivers/block/nvme.c
+++ b/drivers/block/nvme.c
@@ -39,7 +39,6 @@
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/types.h>
-#include <linux/version.h>
 
 #include <asm-generic/io-64-nonatomic-lo-hi.h>
 
diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
index da3cfee782dc..eaade8a1ecd7 100644
--- a/drivers/char/nvram.c
+++ b/drivers/char/nvram.c
@@ -94,7 +94,7 @@
 /* Note that *all* calls to CMOS_READ and CMOS_WRITE must be done with
  * rtc_lock held. Due to the index-port/data-port design of the RTC, we
  * don't want two different things trying to get to it at once. (e.g. the
- * periodic 11 min sync from time.c vs. this driver.)
+ * periodic 11 min sync from kernel/time/ntp.c vs. this driver.)
  */
 
 #include <linux/types.h>
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index ccd124ab7ca7..872e09a02d23 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -57,8 +57,8 @@
  *      Note that *all* calls to CMOS_READ and CMOS_WRITE are done with
  *      interrupts disabled. Due to the index-port/data-port (0x70/0x71)
  *      design of the RTC, we don't want two different things trying to
- *      get to it at once. (e.g. the periodic 11 min sync from time.c vs.
- *      this driver.)
+ *      get to it at once. (e.g. the periodic 11 min sync from
+ *      kernel/time/ntp.c vs. this driver.)
  */
 
 #include <linux/interrupt.h>
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index a1748621111b..70fac9abb0e2 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -76,7 +76,7 @@ enum tis_defaults {
 #define TPM_RID(l)                      (0x0F04 | ((l) << 12))
 
 static LIST_HEAD(tis_chips);
-static DEFINE_SPINLOCK(tis_lock);
+static DEFINE_MUTEX(tis_lock);
 
 #if defined(CONFIG_PNP) && defined(CONFIG_ACPI)
 static int is_itpm(struct pnp_dev *dev)
@@ -689,9 +689,9 @@ static int tpm_tis_init(struct device *dev, resource_size_t start,
         }
 
         INIT_LIST_HEAD(&chip->vendor.list);
-        spin_lock(&tis_lock);
+        mutex_lock(&tis_lock);
         list_add(&chip->vendor.list, &tis_chips);
-        spin_unlock(&tis_lock);
+        mutex_unlock(&tis_lock);
 
 
         return 0;
@@ -855,7 +855,7 @@ static void __exit cleanup_tis(void)
 {
         struct tpm_vendor_specific *i, *j;
         struct tpm_chip *chip;
-        spin_lock(&tis_lock);
+        mutex_lock(&tis_lock);
         list_for_each_entry_safe(i, j, &tis_chips, list) {
                 chip = to_tpm_chip(i);
                 tpm_remove_hardware(chip->dev);
@@ -871,7 +871,7 @@ static void __exit cleanup_tis(void)
                 iounmap(i->iobase);
                 list_del(&i->list);
         }
-        spin_unlock(&tis_lock);
+        mutex_unlock(&tis_lock);
 #ifdef CONFIG_PNP
         if (!force) {
                 pnp_unregister_driver(&tis_pnp_driver);
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c
index 04be90b645b8..faf88b7e1e71 100644
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
@@ -1482,7 +1482,7 @@ static int __devinit iop_adma_probe(struct platform_device *pdev)
                 goto err_free_adev;
         }
 
-        dev_dbg(&pdev->dev, "%s: allocted descriptor pool virt %p phys %p\n",
+        dev_dbg(&pdev->dev, "%s: allocated descriptor pool virt %p phys %p\n",
                 __func__, adev->dma_desc_pool_virt,
                 (void *) adev->dma_desc_pool);
 
diff --git a/drivers/gpu/drm/gma500/psb_intel_lvds.c b/drivers/gpu/drm/gma500/psb_intel_lvds.c
index a25e4ca5e91c..0a437586d8cc 100644
--- a/drivers/gpu/drm/gma500/psb_intel_lvds.c
+++ b/drivers/gpu/drm/gma500/psb_intel_lvds.c
@@ -713,7 +713,6 @@ void psb_intel_lvds_init(struct drm_device *dev,
 
         psb_intel_encoder =
                         kzalloc(sizeof(struct psb_intel_encoder), GFP_KERNEL);
-
         if (!psb_intel_encoder) {
                 dev_err(dev->dev, "psb_intel_encoder allocation error\n");
                 return;
@@ -721,10 +720,9 @@ void psb_intel_lvds_init(struct drm_device *dev,
 
         psb_intel_connector =
                 kzalloc(sizeof(struct psb_intel_connector), GFP_KERNEL);
-
         if (!psb_intel_connector) {
-                kfree(psb_intel_encoder);
                 dev_err(dev->dev, "psb_intel_connector allocation error\n");
+                goto failed_encoder;
         }
 
         lvds_priv = kzalloc(sizeof(struct psb_intel_lvds_priv), GFP_KERNEL);
@@ -862,7 +860,8 @@ failed_blc_i2c:
         drm_encoder_cleanup(encoder);
         drm_connector_cleanup(connector);
 failed_connector:
-        if (psb_intel_connector)
-                kfree(psb_intel_connector);
+        kfree(psb_intel_connector);
+failed_encoder:
+        kfree(psb_intel_encoder);
 }
 
diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c
index 959bf4483bea..c520d06a930c 100644
--- a/drivers/gpu/drm/radeon/rv515.c
+++ b/drivers/gpu/drm/radeon/rv515.c
@@ -150,7 +150,7 @@ void rv515_gpu_init(struct radeon_device *rdev)
 
         if (r100_gui_wait_for_idle(rdev)) {
                 printk(KERN_WARNING "Failed to wait GUI idle while "
-                       "reseting GPU. Bad things might happen.\n");
+                       "resetting GPU. Bad things might happen.\n");
         }
         rv515_vga_render_disable(rdev);
         r420_pipes_init(rdev);
@@ -162,7 +162,7 @@ void rv515_gpu_init(struct radeon_device *rdev)
         WREG32_PLL(0x000D, tmp);
         if (r100_gui_wait_for_idle(rdev)) {
                 printk(KERN_WARNING "Failed to wait GUI idle while "
-                       "reseting GPU. Bad things might happen.\n");
+                       "resetting GPU. Bad things might happen.\n");
         }
         if (rv515_mc_wait_for_idle(rdev)) {
                 printk(KERN_WARNING "Failed to wait MC idle while "
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index f390f5f9cb68..2d6f573bfff2 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -430,7 +430,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset)
         svga_id = vmw_read(dev_priv, SVGA_REG_ID);
         if (svga_id != SVGA_ID_2) {
                 ret = -ENOSYS;
-                DRM_ERROR("Unsuported SVGA ID 0x%x\n", svga_id);
+                DRM_ERROR("Unsupported SVGA ID 0x%x\n", svga_id);
                 mutex_unlock(&dev_priv->hw_mutex);
                 goto out_err0;
         }
diff --git a/drivers/hwmon/tmp401.c b/drivers/hwmon/tmp401.c
index 8b9a77486d57..951442adc067 100644
--- a/drivers/hwmon/tmp401.c
+++ b/drivers/hwmon/tmp401.c
@@ -624,7 +624,7 @@ static int tmp401_probe(struct i2c_client *client,
                         goto exit_remove;
         }
 
-        /* Register aditional tmp411 sysfs hooks */
+        /* Register additional tmp411 sysfs hooks */
         if (data->kind == tmp411) {
                 for (i = 0; i < ARRAY_SIZE(tmp411_attr); i++) {
                         err = device_create_file(&client->dev,
diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 2b73d43cd691..ebe33d960d77 100644
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -3450,7 +3450,7 @@ static struct se_node_acl *srpt_alloc_fabric_acl(struct se_portal_group *se_tpg)
 
         nacl = kzalloc(sizeof(struct srpt_node_acl), GFP_KERNEL);
         if (!nacl) {
-                printk(KERN_ERR "Unable to alocate struct srpt_node_acl\n");
+                printk(KERN_ERR "Unable to allocate struct srpt_node_acl\n");
                 return NULL;
         }
 
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index a08a53448b72..132f93b05154 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -1247,7 +1247,7 @@ static int iommu_init_domains(struct intel_iommu *iommu)
         unsigned long nlongs;
 
         ndomains = cap_ndoms(iommu->cap);
-        pr_debug("IOMMU %d: Number of Domains supportd <%ld>\n", iommu->seq_id,
+        pr_debug("IOMMU %d: Number of Domains supported <%ld>\n", iommu->seq_id,
                         ndomains);
         nlongs = BITS_TO_LONGS(ndomains);
 
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c
index 2fd435bc542e..831d7517c759 100644
--- a/drivers/macintosh/mediabay.c
+++ b/drivers/macintosh/mediabay.c
@@ -356,7 +356,7 @@ static void poll_media_bay(struct media_bay_info* bay)
         static char *mb_content_types[] = {
                 "a floppy drive",
                 "a floppy drive",
-                "an unsuported audio device",
+                "an unsupported audio device",
                 "an ATA device",
                 "an unsupported PCI device",
                 "an unknown device",
diff --git a/drivers/md/dm-bufio.c b/drivers/md/dm-bufio.c
index 0a6806f80ab5..b6e58c7b6df5 100644
--- a/drivers/md/dm-bufio.c
+++ b/drivers/md/dm-bufio.c
@@ -12,7 +12,6 @@
 #include <linux/dm-io.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
-#include <linux/version.h>
 #include <linux/shrinker.h>
 #include <linux/module.h>
 
diff --git a/drivers/media/dvb/dvb-usb/lmedm04.c b/drivers/media/dvb/dvb-usb/lmedm04.c
index b3fe05bbffc9..291f6b110399 100644
--- a/drivers/media/dvb/dvb-usb/lmedm04.c
+++ b/drivers/media/dvb/dvb-usb/lmedm04.c
@@ -1054,7 +1054,7 @@ static int dm04_lme2510_tuner(struct dvb_usb_adapter *adap)
         if (ret)
                 info("TUN Found %s tuner", tun_msg[ret]);
         else {
-                info("TUN No tuner found --- reseting device");
+                info("TUN No tuner found --- resetting device");
                 lme_coldreset(adap->dev->udev);
                 return -ENODEV;
         }
diff --git a/drivers/media/dvb/frontends/drxk_hard.c b/drivers/media/dvb/frontends/drxk_hard.c
index 6980ed7b8786..5ab53795bd7a 100644
--- a/drivers/media/dvb/frontends/drxk_hard.c
+++ b/drivers/media/dvb/frontends/drxk_hard.c
@@ -28,7 +28,6 @@
 #include <linux/delay.h>
 #include <linux/firmware.h>
 #include <linux/i2c.h>
-#include <linux/version.h>
 #include <asm/div64.h>
 
 #include "dvb_frontend.h"
diff --git a/drivers/media/dvb/frontends/tda1004x.c b/drivers/media/dvb/frontends/tda1004x.c
index ae6f22aae677..35d72b46aa1e 100644
--- a/drivers/media/dvb/frontends/tda1004x.c
+++ b/drivers/media/dvb/frontends/tda1004x.c
@@ -1272,7 +1272,7 @@ struct dvb_frontend* tda10045_attach(const struct tda1004x_config* config,
         /* allocate memory for the internal state */
         state = kzalloc(sizeof(struct tda1004x_state), GFP_KERNEL);
         if (!state) {
-                printk(KERN_ERR "Can't alocate memory for tda10045 state\n");
+                printk(KERN_ERR "Can't allocate memory for tda10045 state\n");
                 return NULL;
         }
 
@@ -1342,7 +1342,7 @@ struct dvb_frontend* tda10046_attach(const struct tda1004x_config* config,
         /* allocate memory for the internal state */
         state = kzalloc(sizeof(struct tda1004x_state), GFP_KERNEL);
         if (!state) {
-                printk(KERN_ERR "Can't alocate memory for tda10046 state\n");
+                printk(KERN_ERR "Can't allocate memory for tda10046 state\n");
                 return NULL;
         }
 
diff --git a/drivers/media/dvb/mantis/mantis_hif.c b/drivers/media/dvb/mantis/mantis_hif.c
index 672cf4d2462d..10c68df7e16f 100644
--- a/drivers/media/dvb/mantis/mantis_hif.c
+++ b/drivers/media/dvb/mantis/mantis_hif.c
@@ -76,7 +76,7 @@ static int mantis_hif_write_wait(struct mantis_ca *ca)
                 udelay(500);
                 timeout++;
                 if (timeout > 100) {
-                        dprintk(MANTIS_ERROR, 1, "Adater(%d) Slot(0): Write operation timed out!", mantis->num);
+                        dprintk(MANTIS_ERROR, 1, "Adapter(%d) Slot(0): Write operation timed out!", mantis->num);
                         rc = -ETIMEDOUT;
                         break;
                 }
diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c
index 2dd485996ba8..7ab9afadf29b 100644
--- a/drivers/media/radio/radio-sf16fmr2.c
+++ b/drivers/media/radio/radio-sf16fmr2.c
@@ -172,7 +172,7 @@ static int fmr2_tea_ext_init(struct snd_tea575x *tea)
                 fmr2->volume = v4l2_ctrl_new_std(&tea->ctrl_handler, &fmr2_ctrl_ops, V4L2_CID_AUDIO_VOLUME, 0, 68, 2, 56);
                 fmr2->balance = v4l2_ctrl_new_std(&tea->ctrl_handler, &fmr2_ctrl_ops, V4L2_CID_AUDIO_BALANCE, -68, 68, 2, 0);
                 if (tea->ctrl_handler.error) {
-                        printk(KERN_ERR "radio-sf16fmr2: can't initialize contrls\n");
+                        printk(KERN_ERR "radio-sf16fmr2: can't initialize controls\n");
                         return tea->ctrl_handler.error;
                 }
         }
diff --git a/drivers/media/video/davinci/dm355_ccdc.c b/drivers/media/video/davinci/dm355_ccdc.c
index f83baf3a52b0..5b68847d4017 100644
--- a/drivers/media/video/davinci/dm355_ccdc.c
+++ b/drivers/media/video/davinci/dm355_ccdc.c
@@ -292,7 +292,7 @@ static int validate_ccdc_param(struct ccdc_config_params_raw *ccdcparam)
         if ((ccdcparam->med_filt_thres < 0) ||
            (ccdcparam->med_filt_thres > CCDC_MED_FILT_THRESH)) {
                 dev_dbg(ccdc_cfg.dev,
-                        "Invalid value of median filter thresold\n");
+                        "Invalid value of median filter threshold\n");
                 return -EINVAL;
         }
 
diff --git a/drivers/media/video/ov6650.c b/drivers/media/video/ov6650.c
index 6806345ec2f0..3627f3225bbb 100644
--- a/drivers/media/video/ov6650.c
+++ b/drivers/media/video/ov6650.c
@@ -649,7 +649,7 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)
                         clkrc = CLKRC_24MHz;
                 } else {
                         dev_err(&client->dev,
-                                "unspported input clock, check platform data\n");
+                                "unsupported input clock, check platform data\n");
                         return -EINVAL;
                 }
                 mclk = sense->master_clock;
diff --git a/drivers/mfd/ab5500-core.c b/drivers/mfd/ab5500-core.c
index bd56a764dea1..54d0fe40845f 100644
--- a/drivers/mfd/ab5500-core.c
+++ b/drivers/mfd/ab5500-core.c
@@ -28,7 +28,6 @@
 #include <linux/bitops.h>
 #include <linux/spinlock.h>
 #include <linux/mfd/core.h>
-#include <linux/version.h>
 #include <linux/mfd/db5500-prcmu.h>
 
 #include "ab5500-core.h"
diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c
index 1bcfd6dbb5cc..c3622a69f432 100644
--- a/drivers/mmc/host/s3cmci.c
+++ b/drivers/mmc/host/s3cmci.c
@@ -1606,7 +1606,7 @@ static int __devinit s3cmci_probe(struct platform_device *pdev)
         host->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!host->mem) {
                 dev_err(&pdev->dev,
-                        "failed to get io memory region resouce.\n");
+                        "failed to get io memory region resource.\n");
 
                 ret = -ENOENT;
                 goto probe_free_gpio;
@@ -1630,7 +1630,7 @@ static int __devinit s3cmci_probe(struct platform_device *pdev)
 
         host->irq = platform_get_irq(pdev, 0);
         if (host->irq == 0) {
-                dev_err(&pdev->dev, "failed to get interrupt resouce.\n");
+                dev_err(&pdev->dev, "failed to get interrupt resource.\n");
                 ret = -EINVAL;
                 goto probe_iounmap;
         }
diff --git a/drivers/mtd/chips/chipreg.c b/drivers/mtd/chips/chipreg.c
index da1f96f385c7..0bbc61ba9524 100644
--- a/drivers/mtd/chips/chipreg.c
+++ b/drivers/mtd/chips/chipreg.c
@@ -76,10 +76,7 @@ struct mtd_info *do_map_probe(const char *name, struct map_info *map)
         */
         module_put(drv->module);
 
-        if (ret)
-                return ret;
-
-        return NULL;
+        return ret;
 }
 /*
  * Destroy an MTD device which was created for a map device.
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index aa15cc4269a1..50f87b60b0bd 100644
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -1466,7 +1466,7 @@ static int prism2_hw_enable(struct net_device *dev, int initial)
          * before it starts acting as an AP, so reset port automatically
          * here just in case */
         if (initial && prism2_reset_port(dev)) {
-                printk("%s: MAC port 0 reseting failed\n", dev->name);
+                printk("%s: MAC port 0 resetting failed\n", dev->name);
                 return 1;
         }
 
@@ -1557,7 +1557,7 @@ static void prism2_hw_reset(struct net_device *dev)
         static long last_reset = 0;
 
         /* do not reset card more than once per second to avoid ending up in a
-         * busy loop reseting the card */
+         * busy loop resetting the card */
         if (time_before_eq(jiffies, last_reset + HZ))
                 return;
         last_reset = jiffies;
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 9fcde36d5013..c9e2660e1263 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -856,7 +856,7 @@ reset_device:
 
         /* semaphore stuck, reset device to avoid fw freeze later */
         dev_warn(zd_mac_dev(mac), "CR_BCN_FIFO_SEMAPHORE stuck, "
-                                  "reseting device...");
+                                  "resetting device...");
         usb_queue_reset_device(mac->chip.usb.intf);
 
         return r;
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
index 785bdbe38f2a..f766b3e67c6d 100644
--- a/drivers/net/wireless/zd1211rw/zd_usb.c
+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
@@ -1104,7 +1104,7 @@ static void zd_tx_watchdog_handler(struct work_struct *work)
                 goto out;
 
         /* TX halted, try reset */
-        dev_warn(zd_usb_dev(usb), "TX-stall detected, reseting device...");
+        dev_warn(zd_usb_dev(usb), "TX-stall detected, resetting device...");
 
         usb_queue_reset_device(usb->intf);
 
diff --git a/drivers/platform/x86/hdaps.c b/drivers/platform/x86/hdaps.c
index 5a34973dc164..ba68d4e7a779 100644
--- a/drivers/platform/x86/hdaps.c
+++ b/drivers/platform/x86/hdaps.c
@@ -379,7 +379,7 @@ static ssize_t hdaps_temp1_show(struct device *dev,
         int ret;
 
         ret = hdaps_readb_one(HDAPS_PORT_TEMP1, &temp);
-        if (ret < 0)
+        if (ret)
                 return ret;
 
         return sprintf(buf, "%u\n", temp);
@@ -392,7 +392,7 @@ static ssize_t hdaps_temp2_show(struct device *dev,
         int ret;
 
         ret = hdaps_readb_one(HDAPS_PORT_TEMP2, &temp);
-        if (ret < 0)
+        if (ret)
                 return ret;
 
         return sprintf(buf, "%u\n", temp);
diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c
index 1ed6ea0bad6e..222ccd872ac5 100644
--- a/drivers/power/bq27x00_battery.c
+++ b/drivers/power/bq27x00_battery.c
@@ -47,10 +47,10 @@
 #define BQ27x00_REG_TTE                 0x16
 #define BQ27x00_REG_TTF                 0x18
 #define BQ27x00_REG_TTECP               0x26
-#define BQ27x00_REG_NAC                 0x0C /* Nominal available capaciy */
+#define BQ27x00_REG_NAC                 0x0C /* Nominal available capacity */
 #define BQ27x00_REG_LMD                 0x12 /* Last measured discharge */
 #define BQ27x00_REG_CYCT                0x2A /* Cycle count total */
-#define BQ27x00_REG_AE                  0x22 /* Available enery */
+#define BQ27x00_REG_AE                  0x22 /* Available energy */
 
 #define BQ27000_REG_RSOC                0x0B /* Relative State-of-Charge */
 #define BQ27000_REG_ILMD                0x76 /* Initial last measured discharge */
diff --git a/drivers/scsi/aic7xxx/aic79xx_core.c b/drivers/scsi/aic7xxx/aic79xx_core.c
index 5f8617dd43bb..25417d0e7acb 100644
--- a/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -8993,7 +8993,7 @@ ahd_handle_scsi_status(struct ahd_softc *ahd, struct scb *scb)
                                         printk("Invalid Command IU Field\n");
                                         break;
                                 case SIU_PFC_TMF_NOT_SUPPORTED:
-                                        printk("TMF not supportd\n");
+                                        printk("TMF not supported\n");
                                         break;
                                 case SIU_PFC_TMF_FAILED:
                                         printk("TMF failed\n");
@@ -9113,7 +9113,7 @@ ahd_handle_scsi_status(struct ahd_softc *ahd, struct scb *scb)
                 break;
         }
         case SCSI_STATUS_OK:
-                printk("%s: Interrupted for staus of 0???\n",
+                printk("%s: Interrupted for status of 0???\n",
                        ahd_name(ahd));
                 /* FALLTHROUGH */
         default:
diff --git a/drivers/scsi/aic7xxx/aic7xxx_core.c b/drivers/scsi/aic7xxx/aic7xxx_core.c
index dc28b0a91b22..10172a3af1b9 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_core.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_core.c
@@ -1049,7 +1049,7 @@ ahc_handle_seqint(struct ahc_softc *ahc, u_int intstat)
                 ahc_set_scsi_status(scb, hscb->shared_data.status.scsi_status);
                 switch (hscb->shared_data.status.scsi_status) {
                 case SCSI_STATUS_OK:
-                        printk("%s: Interrupted for staus of 0???\n",
+                        printk("%s: Interrupted for status of 0???\n",
                                ahc_name(ahc));
                         break;
                 case SCSI_STATUS_CMD_TERMINATED:
diff --git a/drivers/scsi/isci/host.c b/drivers/scsi/isci/host.c
index 418391b1c361..6ca9b26bb2fb 100644
--- a/drivers/scsi/isci/host.c
+++ b/drivers/scsi/isci/host.c
@@ -58,7 +58,6 @@
 #include "host.h"
 #include "isci.h"
 #include "port.h"
-#include "host.h"
 #include "probe_roms.h"
 #include "remote_device.h"
 #include "request.h"
diff --git a/drivers/scsi/mpt2sas/mpt2sas_config.c b/drivers/scsi/mpt2sas/mpt2sas_config.c
index 36ea0b2d8020..2b4d37613d32 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_config.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_config.c
@@ -149,7 +149,7 @@ _config_display_some_debug(struct MPT2SAS_ADAPTER *ioc, u16 smid,
                         desc = "raid_config";
                         break;
                 case MPI2_CONFIG_EXTPAGETYPE_DRIVER_MAPPING:
-                        desc = "driver_mappping";
+                        desc = "driver_mapping";
                         break;
                 }
                 break;
diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c
index b7b92f7be2aa..e12c4f632a63 100644
--- a/drivers/scsi/pm8001/pm8001_hwi.c
+++ b/drivers/scsi/pm8001/pm8001_hwi.c
@@ -3532,7 +3532,7 @@ static void process_one_iomb(struct pm8001_hba_info *pm8001_ha, void *piomb)
                 break;
         case OPC_OUB_DEREG_DEV:
                 PM8001_MSG_DBG(pm8001_ha,
-                        pm8001_printk("unresgister the deviece\n"));
+                        pm8001_printk("unregister the device\n"));
                 mpi_dereg_resp(pm8001_ha, piomb);
                 break;
         case OPC_OUB_GET_DEV_HANDLE:
diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
index ca496c7474e3..e1d150f3fd4d 100644
--- a/drivers/scsi/pmcraid.h
+++ b/drivers/scsi/pmcraid.h
@@ -857,11 +857,11 @@ static struct pmcraid_ioasc_error pmcraid_ioasc_error_table[] = {
         {0x01180600, IOASC_LOG_LEVEL_HARD,
          "Recovered Error, soft media error, sector reassignment suggested"},
         {0x015D0000, IOASC_LOG_LEVEL_HARD,
-         "Recovered Error, failure prediction thresold exceeded"},
+         "Recovered Error, failure prediction threshold exceeded"},
         {0x015D9200, IOASC_LOG_LEVEL_HARD,
-         "Recovered Error, soft Cache Card Battery error thresold"},
+         "Recovered Error, soft Cache Card Battery error threshold"},
         {0x015D9200, IOASC_LOG_LEVEL_HARD,
-         "Recovered Error, soft Cache Card Battery error thresold"},
+         "Recovered Error, soft Cache Card Battery error threshold"},
         {0x02048000, IOASC_LOG_LEVEL_HARD,
          "Not Ready, IOA Reset Required"},
         {0x02408500, IOASC_LOG_LEVEL_HARD,
diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c
index 1682e2e4201d..2c4714279bcc 100644
--- a/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/drivers/scsi/qla2xxx/qla_bsg.c
@@ -731,7 +731,7 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
 
                         if (elreq.options != EXTERNAL_LOOPBACK) {
                                 ql_dbg(ql_dbg_user, vha, 0x7020,
-                                    "Internal: curent port config = %x\n",
+                                    "Internal: current port config = %x\n",
                                     config[0]);
                                 if (qla81xx_set_internal_loopback(vha, config,
                                         new_config)) {
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index ce6d3b7f0c61..edf503437e96 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -3382,7 +3382,7 @@ static int get_fw_boot_info(struct scsi_qla_host *ha, uint16_t ddb_index[])
                 if (qla4xxx_get_flash(ha, buf_dma, addr,
                                       13 * sizeof(uint8_t)) != QLA_SUCCESS) {
                         DEBUG2(ql4_printk(KERN_ERR, ha, "scsi%ld: %s: Get Flash"
-                                          "failed\n", ha->host_no, __func__));
+                                          " failed\n", ha->host_no, __func__));
                         ret = QLA_ERROR;
                         goto exit_boot_info_free;
                 }
@@ -3620,7 +3620,7 @@ static int qla4xxx_setup_boot_info(struct scsi_qla_host *ha)
 
         if (ql4xdisablesysfsboot) {
                 ql4_printk(KERN_INFO, ha,
-                           "%s: syfsboot disabled - driver will trigger login"
+                           "%s: syfsboot disabled - driver will trigger login "
                            "and publish session for discovery .\n", __func__);
                 return QLA_SUCCESS;
         }
diff --git a/drivers/staging/iio/dac/ad5686.c b/drivers/staging/iio/dac/ad5686.c
index ce2d6193dd89..2415a6e60c77 100644
--- a/drivers/staging/iio/dac/ad5686.c
+++ b/drivers/staging/iio/dac/ad5686.c
@@ -15,7 +15,6 @@
 #include <linux/slab.h>
 #include <linux/sysfs.h>
 #include <linux/regulator/consumer.h>
-#include <linux/module.h>
 
 #include "../iio.h"
 #include "../sysfs.h"
diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
index 6bee4907c6a5..34b1a3c43066 100644
--- a/drivers/tty/synclink_gt.c
+++ b/drivers/tty/synclink_gt.c
@@ -3923,7 +3923,7 @@ static void tdma_reset(struct slgt_info *info)
  */
 static void enable_loopback(struct slgt_info *info)
 {
-        /* SCR (serial control) BIT2=looopback enable */
+        /* SCR (serial control) BIT2=loopback enable */
         wr_reg16(info, SCR, (unsigned short)(rd_reg16(info, SCR) | BIT2));
 
         if (info->params.mode != MGSL_MODE_ASYNC) {