Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Pull trivial tree updates from Jiri Kosina:
 "Usual rocket science stuff from trivial.git"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  neighbour.h: fix comment
  sched: Fix warning on make htmldocs caused by wait.h
  slab: struct kmem_cache is protected by slab_mutex
  doc: Fix typo in USB Gadget Documentation
  of/Kconfig: Spelling s/one/once/
  mkregtable: Fix sscanf handling
  lp5523, lp8501: comment improvements
  thermal: rcar: comment spelling
  treewide: fix comments and printk msgs
  IXP4xx: remove '1 &&' from a condition check in ixp4xx_restart()
  Documentation: update /proc/uptime field description
  Documentation: Fix size parameter for snprintf
  arm: fix comment header and macro name
  asm-generic: uaccess: Spelling s/a ny/any/
  mtd: onenand: fix comment header
  doc: driver-model/platform.txt: fix a typo
  drivers: fix typo in DEVTMPFS_MOUNT Kconfig help text
  doc: Fix typo (acces_process_vm -> access_process_vm)
  treewide: Fix typos in printk
  drivers/gpu/drm/qxl/Kconfig: reformat the help text
  ...

38 files changed, 50 insertions, 46 deletions

diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index e373671652b0..ec36e7772e57 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -49,7 +49,7 @@ config DEVTMPFS_MOUNT
           with the commandline parameter: devtmpfs.mount=0|1.
           This option does not affect initramfs based booting, here
           the devtmpfs filesystem always needs to be mounted manually
-          after the roots is mounted.
+          after the rootfs is mounted.
           With this option enabled, it allows to bring up a system in
           rescue mode with init=/bin/sh, even when the /dev directory
           on the rootfs is completely empty.
diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index 8cc98cd0d4a8..816d979c3266 100644
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -31,7 +31,6 @@ obj-$(CONFIG_BLK_DEV_NBD)	+= nbd.o
 obj-$(CONFIG_BLK_DEV_CRYPTOLOOP) += cryptoloop.o
 obj-$(CONFIG_VIRTIO_BLK)        += virtio_blk.o
 
-obj-$(CONFIG_VIODASD)           += viodasd.o
 obj-$(CONFIG_BLK_DEV_SX8)       += sx8.o
 obj-$(CONFIG_BLK_DEV_HD)        += hd.o
 
diff --git a/drivers/cdrom/Makefile b/drivers/cdrom/Makefile
index ecf85fda0fc1..8ffde4f8ab9a 100644
--- a/drivers/cdrom/Makefile
+++ b/drivers/cdrom/Makefile
@@ -10,5 +10,4 @@ obj-$(CONFIG_BLK_DEV_SR)	+=              cdrom.o
 obj-$(CONFIG_PARIDE_PCD)        +=              cdrom.o
 obj-$(CONFIG_CDROM_PKTCDVD)     +=              cdrom.o
 
-obj-$(CONFIG_VIOCD)             += viocd.o      cdrom.o
 obj-$(CONFIG_GDROM)             += gdrom.o      cdrom.o
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 7ff1d0d208a7..290fe5b7fd32 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -13,7 +13,6 @@ obj-$(CONFIG_MSM_SMD_PKT)	+= msm_smd_pkt.o
 obj-$(CONFIG_MSPEC)             += mspec.o
 obj-$(CONFIG_MMTIMER)           += mmtimer.o
 obj-$(CONFIG_UV_MMTIMER)        += uv_mmtimer.o
-obj-$(CONFIG_VIOTAPE)           += viotape.o
 obj-$(CONFIG_IBM_BSR)           += bsr.o
 obj-$(CONFIG_SGI_MBCS)          += mbcs.o
 obj-$(CONFIG_BFIN_OTP)          += bfin-otp.o
diff --git a/drivers/char/msm_smd_pkt.c b/drivers/char/msm_smd_pkt.c
index 8eca55deb3a3..ba82a06d9684 100644
--- a/drivers/char/msm_smd_pkt.c
+++ b/drivers/char/msm_smd_pkt.c
@@ -182,7 +182,7 @@ static int smd_pkt_write(struct file *file, const char __user *buf,
         if (count > MAX_BUF_SIZE)
                 return -EINVAL;
 
-        DBG("writting %d bytes\n", count);
+        DBG("writing %d bytes\n", count);
 
         smd_pkt_devp = file->private_data;
         if (!smd_pkt_devp || !smd_pkt_devp->ch)
diff --git a/drivers/devfreq/exynos/exynos4_bus.c b/drivers/devfreq/exynos/exynos4_bus.c
index cede6f71cd63..bbbfe6853b18 100644
--- a/drivers/devfreq/exynos/exynos4_bus.c
+++ b/drivers/devfreq/exynos/exynos4_bus.c
@@ -116,7 +116,7 @@ static struct bus_opp_table exynos4210_busclk_table[] = {
 };
 
 /*
- * MIF is the main control knob clock for exynox4x12 MIF/INT
+ * MIF is the main control knob clock for Exynos4x12 MIF/INT
  * clock and voltage of both mif/int are controlled.
  */
 static struct bus_opp_table exynos4x12_mifclk_table[] = {
diff --git a/drivers/devfreq/exynos/exynos5_bus.c b/drivers/devfreq/exynos/exynos5_bus.c
index a60da3c1c48e..6eef1f7397c6 100644
--- a/drivers/devfreq/exynos/exynos5_bus.c
+++ b/drivers/devfreq/exynos/exynos5_bus.c
@@ -152,7 +152,7 @@ static int exynos5_busfreq_int_target(struct device *dev, unsigned long *_freq,
         if (old_freq == freq)
                 return 0;
 
-        dev_dbg(dev, "targetting %lukHz %luuV\n", freq, volt);
+        dev_dbg(dev, "targeting %lukHz %luuV\n", freq, volt);
 
         mutex_lock(&data->lock);
 
diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
index ebc01503d50e..6f3400f3978a 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
@@ -36,9 +36,9 @@ enum exynos_crtc_mode {
  * @pipe: a crtc index created at load() with a new crtc object creation
  *      and the crtc object would be set to private->crtc array
  *      to get a crtc object corresponding to this pipe from private->crtc
- *      array when irq interrupt occured. the reason of using this pipe is that
+ *      array when irq interrupt occurred. the reason of using this pipe is that
  *      drm framework doesn't support multiple irq yet.
- *      we can refer to the crtc to current hardware interrupt occured through
+ *      we can refer to the crtc to current hardware interrupt occurred through
  *      this pipe value.
  * @dpms: store the crtc dpms value
  * @mode: store the crtc mode value
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimc.c b/drivers/gpu/drm/exynos/exynos_drm_fimc.c
index 8adfc8f1e08f..30d76b2ff9c2 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimc.c
@@ -345,7 +345,7 @@ static bool fimc_check_ovf(struct fimc_context *ctx)
 
                 fimc_write(cfg, EXYNOS_CIWDOFST);
 
-                dev_err(ippdrv->dev, "occured overflow at %d, status 0x%x.\n",
+                dev_err(ippdrv->dev, "occurred overflow at %d, status 0x%x.\n",
                         ctx->id, status);
                 return true;
         }
diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
index 7bccedca487a..380aec28840b 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
@@ -1126,7 +1126,7 @@ int exynos_g2d_set_cmdlist_ioctl(struct drm_device *drm_dev, void *data,
          * G2D interrupt event once current command list execution is
          * finished.
          * Otherwise only ACF bit should be set to INTEN register so
-         * that one interrupt is occured after all command lists
+         * that one interrupt is occurred after all command lists
          * have been completed.
          */
         if (node->event) {
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c
index 1ade191d84f4..be59d50d8b16 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gem.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c
@@ -652,7 +652,7 @@ int exynos_drm_gem_dumb_create(struct drm_file *file_priv,
         int ret;
 
         /*
-         * alocate memory to be used for framebuffer.
+         * allocate memory to be used for framebuffer.
          * - this callback would be called by user application
          *      with DRM_IOCTL_MODE_CREATE_DUMB command.
          */
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.h b/drivers/gpu/drm/exynos/exynos_drm_gem.h
index 702ec3abe85c..b8c818ba2ff4 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gem.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_gem.h
@@ -60,7 +60,7 @@ struct exynos_drm_gem_buf {
  * @vma: a pointer to vm_area.
  * @flags: indicate memory type to allocated buffer and cache attruibute.
  *
- * P.S. this object would be transfered to user as kms_bo.handle so
+ * P.S. this object would be transferred to user as kms_bo.handle so
  *      user can access the buffer through kms_bo.handle.
  */
 struct exynos_drm_gem_obj {
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gsc.c b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
index cd6aebd53bd0..fa75059a6104 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_gsc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
@@ -1301,13 +1301,13 @@ static irqreturn_t gsc_irq_handler(int irq, void *dev_id)
 
         status = gsc_read(GSC_IRQ);
         if (status & GSC_IRQ_STATUS_OR_IRQ) {
-                dev_err(ippdrv->dev, "occured overflow at %d, status 0x%x.\n",
+                dev_err(ippdrv->dev, "occurred overflow at %d, status 0x%x.\n",
                         ctx->id, status);
                 return IRQ_NONE;
         }
 
         if (status & GSC_IRQ_STATUS_OR_FRM_DONE) {
-                dev_dbg(ippdrv->dev, "occured frame done at %d, status 0x%x.\n",
+                dev_dbg(ippdrv->dev, "occurred frame done at %d, status 0x%x.\n",
                         ctx->id, status);
 
                 buf_id[EXYNOS_DRM_OPS_SRC] = gsc_get_src_buf_index(ctx);
diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.c b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
index 824e0705c8d3..d519a4e5fe40 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_ipp.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.c
@@ -335,7 +335,7 @@ int exynos_drm_ipp_get_property(struct drm_device *drm_dev, void *data,
         } else {
                 /*
                  * Getting ippdrv capability by ipp_id.
-                 * some deivce not supported wb, output interface.
+                 * some device not supported wb, output interface.
                  * so, user application detect correct ipp driver
                  * using this ioctl.
                  */
diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.h b/drivers/gpu/drm/exynos/exynos_drm_ipp.h
index 4cadbea7dbde..ab1634befc05 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_ipp.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.h
@@ -48,7 +48,7 @@ struct drm_exynos_ipp_cmd_work {
 /*
  * A structure of command node.
  *
- * @priv: IPP private infomation.
+ * @priv: IPP private information.
  * @list: list head to command queue information.
  * @event_list: list head of event.
  * @mem_list: list head to source,destination memory queue information.
@@ -92,7 +92,7 @@ struct drm_exynos_ipp_buf_info {
 };
 
 /*
- * A structure of wb setting infomation.
+ * A structure of wb setting information.
  *
  * @enable: enable flag for wb.
  * @refresh: HZ of the refresh rate.
diff --git a/drivers/gpu/drm/qxl/Kconfig b/drivers/gpu/drm/qxl/Kconfig
index 66ac0ff95f5a..38c2bb72e456 100644
--- a/drivers/gpu/drm/qxl/Kconfig
+++ b/drivers/gpu/drm/qxl/Kconfig
@@ -5,9 +5,11 @@ config DRM_QXL
         select FB_SYS_COPYAREA
         select FB_SYS_IMAGEBLIT
         select FB_DEFERRED_IO
-        select DRM_KMS_HELPER
+        select DRM_KMS_HELPER
         select DRM_KMS_FB_HELPER
-        select DRM_TTM
+        select DRM_TTM
         select CRC32
         help
-                QXL virtual GPU for Spice virtualization desktop integration. Do not enable this driver unless your distro ships a corresponding X.org QXL driver that can handle kernel modesetting.
+          QXL virtual GPU for Spice virtualization desktop integration.
+          Do not enable this driver unless your distro ships a corresponding
+          X.org QXL driver that can handle kernel modesetting.
diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
index af85299f2126..4a85bb644e24 100644
--- a/drivers/gpu/drm/radeon/mkregtable.c
+++ b/drivers/gpu/drm/radeon/mkregtable.c
@@ -655,7 +655,7 @@ static int parser_auth(struct table *t, const char *filename)
 
         /* first line will contain the last register
          * and gpu name */
-        sscanf(buf, "%s %s", gpu_name, last_reg_s);
+        sscanf(buf, "%9s %9s", gpu_name, last_reg_s);
         t->gpu_prefix = gpu_name;
         last_reg = strtol(last_reg_s, NULL, 16);
 
diff --git a/drivers/i2c/busses/i2c-exynos5.c b/drivers/i2c/busses/i2c-exynos5.c
index c1ef228095b5..044f85b01d06 100644
--- a/drivers/i2c/busses/i2c-exynos5.c
+++ b/drivers/i2c/busses/i2c-exynos5.c
@@ -571,7 +571,7 @@ static int exynos5_i2c_xfer(struct i2c_adapter *adap,
         int i = 0, ret = 0, stop = 0;
 
         if (i2c->suspended) {
-                dev_err(i2c->dev, "HS-I2C is not initialzed.\n");
+                dev_err(i2c->dev, "HS-I2C is not initialized.\n");
                 return -EIO;
         }
 
diff --git a/drivers/i2c/busses/i2c-stu300.c b/drivers/i2c/busses/i2c-stu300.c
index 04a17b9b38bb..5b80ef310841 100644
--- a/drivers/i2c/busses/i2c-stu300.c
+++ b/drivers/i2c/busses/i2c-stu300.c
@@ -801,7 +801,7 @@ static int stu300_xfer_msg(struct i2c_adapter *adap,
         /* Check that the bus is free, or wait until some timeout occurs */
         ret = stu300_wait_while_busy(dev);
         if (ret != 0) {
-                dev_err(&dev->pdev->dev, "timout waiting for transfer "
+                dev_err(&dev->pdev->dev, "timeout waiting for transfer "
                        "to commence.\n");
                 goto exit_disable;
         }
diff --git a/drivers/iio/adc/twl6030-gpadc.c b/drivers/iio/adc/twl6030-gpadc.c
index 53e1c645cee7..53a24ebb92c3 100644
--- a/drivers/iio/adc/twl6030-gpadc.c
+++ b/drivers/iio/adc/twl6030-gpadc.c
@@ -969,7 +969,7 @@ static int twl6030_gpadc_suspend(struct device *pdev)
         ret = twl_i2c_write_u8(TWL6030_MODULE_ID1, TWL6030_GPADCR,
                                 TWL6030_REG_TOGGLE1);
         if (ret)
-                dev_err(pdev, "error reseting GPADC (%d)!\n", ret);
+                dev_err(pdev, "error resetting GPADC (%d)!\n", ret);
 
         return 0;
 };
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.c b/drivers/isdn/hisax/hfc4s8s_l1.c
index c49c294fc81e..414dbf6da89a 100644
--- a/drivers/isdn/hisax/hfc4s8s_l1.c
+++ b/drivers/isdn/hisax/hfc4s8s_l1.c
@@ -1620,7 +1620,7 @@ hfc4s8s_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 #else
         if (!request_region(hw->iobase, 8, hw->card_name)) {
                 printk(KERN_INFO
-                       "HFC-4S/8S: failed to rquest address space at 0x%04x\n",
+                       "HFC-4S/8S: failed to request address space at 0x%04x\n",
                        hw->iobase);
                 goto out;
         }
diff --git a/drivers/isdn/mISDN/Kconfig b/drivers/isdn/mISDN/Kconfig
index 1747a02a019a..c0730d5c734d 100644
--- a/drivers/isdn/mISDN/Kconfig
+++ b/drivers/isdn/mISDN/Kconfig
@@ -17,7 +17,7 @@ config MISDN_DSP
 
           This module may be used for special applications that require
           cross connecting of bchannels, conferencing, dtmf decoding,
-          echo cancelation, tone generation, and Blowfish encryption and
+          echo cancellation, tone generation, and Blowfish encryption and
           decryption. It may use hardware features if available.
 
           E.g. it is required for PBX4Linux. Go to http://isdn.eversberg.eu
diff --git a/drivers/leds/leds-lp5523.c b/drivers/leds/leds-lp5523.c
index fd9ab5f61441..3a0bc886a87a 100644
--- a/drivers/leds/leds-lp5523.c
+++ b/drivers/leds/leds-lp5523.c
@@ -35,7 +35,15 @@
 
 #include "leds-lp55xx-common.h"
 
-#define LP5523_PROGRAM_LENGTH           32
+#define LP5523_PROGRAM_LENGTH           32      /* bytes */
+/* Memory is used like this:
+   0x00 engine 1 program
+   0x10 engine 2 program
+   0x20 engine 3 program
+   0x30 engine 1 muxing info
+   0x40 engine 2 muxing info
+   0x50 engine 3 muxing info
+*/
 #define LP5523_MAX_LEDS                 9
 
 /* Registers */
diff --git a/drivers/leds/leds-lp8501.c b/drivers/leds/leds-lp8501.c
index f1c704f2243a..00f068b0fa6f 100644
--- a/drivers/leds/leds-lp8501.c
+++ b/drivers/leds/leds-lp8501.c
@@ -263,7 +263,7 @@ static void lp8501_firmware_loaded(struct lp55xx_chip *chip)
         }
 
         /*
-         * Program momery sequence
+         * Program memory sequence
          *  1) set engine mode to "LOAD"
          *  2) write firmware data into program memory
          */
diff --git a/drivers/media/platform/ti-vpe/vpdma.c b/drivers/media/platform/ti-vpe/vpdma.c
index af0a5ffcaa98..fcbe48a09cf8 100644
--- a/drivers/media/platform/ti-vpe/vpdma.c
+++ b/drivers/media/platform/ti-vpe/vpdma.c
@@ -577,8 +577,8 @@ static void dump_dtd(struct vpdma_dtd *dtd)
                 pr_debug("word5: max_width %d, max_height %d\n",
                         dtd_get_max_width(dtd), dtd_get_max_height(dtd));
 
-        pr_debug("word6: client specfic attr0 = 0x%08x\n", dtd->client_attr0);
-        pr_debug("word7: client specfic attr1 = 0x%08x\n", dtd->client_attr1);
+        pr_debug("word6: client specific attr0 = 0x%08x\n", dtd->client_attr0);
+        pr_debug("word7: client specific attr1 = 0x%08x\n", dtd->client_attr1);
 }
 
 /*
diff --git a/drivers/misc/fsa9480.c b/drivers/misc/fsa9480.c
index a725c79c35f5..71d2793b372c 100644
--- a/drivers/misc/fsa9480.c
+++ b/drivers/misc/fsa9480.c
@@ -396,7 +396,7 @@ static int fsa9480_irq_init(struct fsa9480_usbsw *usbsw)
                                 IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
                                 "fsa9480 micro USB", usbsw);
                 if (ret) {
-                        dev_err(&client->dev, "failed to reqeust IRQ\n");
+                        dev_err(&client->dev, "failed to request IRQ\n");
                         return ret;
                 }
 
diff --git a/drivers/mtd/onenand/samsung.h b/drivers/mtd/onenand/samsung.h
index c4a80e67e438..9016dc0136a8 100644
--- a/drivers/mtd/onenand/samsung.h
+++ b/drivers/mtd/onenand/samsung.h
@@ -1,6 +1,4 @@
 /*
- * linux/arch/arm/plat-s3c/include/plat/regs-onenand.h
- *
  *  Copyright (C) 2008-2010 Samsung Electronics
  *  Kyungmin Park <kyungmin.park@samsung.com>
  *
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index 7ef435bab425..f51204cfe12f 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -2126,7 +2126,7 @@ bug_out:
 
     spin_unlock_irqrestore(&sc->lmc_lock, flags);
 
-    lmc_trace(dev, "lmc_driver_timout out");
+    lmc_trace(dev, "lmc_driver_timeout out");
 
 
 }
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index 178b222b3ce1..65f18f1e869c 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -248,7 +248,7 @@ int lbs_process_event(struct lbs_private *priv, u32 event)
                 /* handle unexpected PS SLEEP event */
                 if (priv->psstate == PS_STATE_FULL_POWER) {
                         lbs_deb_cmd(
-                               "EVENT: in FULL POWER mode, ignoreing PS_SLEEP\n");
+                               "EVENT: in FULL POWER mode, ignoring PS_SLEEP\n");
                         break;
                 }
                 priv->psstate = PS_STATE_PRE_SLEEP;
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 1f02003ea08d..c8bd092fc945 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -204,9 +204,9 @@ config SCSI_MULTI_LUN
           Some devices support more than one LUN (Logical Unit Number) in order
           to allow access to several media, e.g. CD jukebox, USB card reader,
           mobile phone in mass storage mode. This option forces the kernel to
-          probe for all LUNs by default. This setting can be overriden by
+          probe for all LUNs by default. This setting can be overridden by
           max_luns boot/module parameter. Note that this option does not affect
-          devices conforming to SCSI-3 or higher as they can explicitely report
+          devices conforming to SCSI-3 or higher as they can explicitly report
           their number of LUNs. It is safe to say Y here unless you have one of
           those rare devices which reacts in an unexpected way when probed for
           multiple LUNs.
diff --git a/drivers/scsi/qla2xxx/qla_nx2.c b/drivers/scsi/qla2xxx/qla_nx2.c
index b45f4d78ee36..f60989d729a8 100644
--- a/drivers/scsi/qla2xxx/qla_nx2.c
+++ b/drivers/scsi/qla2xxx/qla_nx2.c
@@ -2254,7 +2254,7 @@ qla8044_minidump_process_rdmem(struct scsi_qla_host *vha,
 
         if (r_addr & 0xf) {
                 ql_dbg(ql_dbg_p3p, vha, 0xb0f1,
-                    "[%s]: Read addr 0x%x not 16 bytes alligned\n",
+                    "[%s]: Read addr 0x%x not 16 bytes aligned\n",
                     __func__, r_addr);
                 return QLA_FUNCTION_FAILED;
         }
diff --git a/drivers/scsi/qla4xxx/ql4_83xx.c b/drivers/scsi/qla4xxx/ql4_83xx.c
index 8196c2f7915c..919284834ad7 100644
--- a/drivers/scsi/qla4xxx/ql4_83xx.c
+++ b/drivers/scsi/qla4xxx/ql4_83xx.c
@@ -465,7 +465,7 @@ int qla4_83xx_drv_lock(struct scsi_qla_host *ha)
                                 }
                                 /* Recovery Failed, some other function
                                  * has the lock, wait for 2secs and retry */
-                                ql4_printk(KERN_INFO, ha, "%s: IDC lock Recovery by %d failed, Retrying timout\n",
+                                ql4_printk(KERN_INFO, ha, "%s: IDC lock Recovery by %d failed, Retrying timeout\n",
                                            __func__, ha->func_num);
                                 timeout = 0;
                         }
diff --git a/drivers/staging/usbip/usbip_common.c b/drivers/staging/usbip/usbip_common.c
index 4470cd321d65..96552e3a1bfb 100644
--- a/drivers/staging/usbip/usbip_common.c
+++ b/drivers/staging/usbip/usbip_common.c
@@ -367,7 +367,6 @@ int usbip_recv(struct socket *sock, void *buf, int size)
                 msg.msg_namelen = 0;
                 msg.msg_control = NULL;
                 msg.msg_controllen = 0;
-                msg.msg_namelen    = 0;
                 msg.msg_flags      = MSG_NOSIGNAL;
 
                 result = kernel_recvmsg(sock, &msg, &iov, 1, size, MSG_WAITALL);
diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c
index 88f92e1a9944..79a09d02bbca 100644
--- a/drivers/thermal/rcar_thermal.c
+++ b/drivers/thermal/rcar_thermal.c
@@ -408,7 +408,7 @@ static int rcar_thermal_probe(struct platform_device *pdev)
                 /* enable temperature comparation */
                 rcar_thermal_common_write(common, ENR, 0x00030303);
 
-                idle = 0; /* polling delaye is not needed */
+                idle = 0; /* polling delay is not needed */
         }
 
         for (i = 0;; i++) {
diff --git a/drivers/tty/serial/crisv10.c b/drivers/tty/serial/crisv10.c
index 477f22f773fc..690bdea0a0c1 100644
--- a/drivers/tty/serial/crisv10.c
+++ b/drivers/tty/serial/crisv10.c
@@ -2153,7 +2153,7 @@ static void flush_timeout_function(unsigned long data)
 
         fast_timers[info->line].function = NULL;
         serial_fast_timer_expired++;
-        TIMERD(DEBUG_LOG(info->line, "flush_timout %i ", info->line));
+        TIMERD(DEBUG_LOG(info->line, "flush_timeout %i ", info->line));
         TIMERD(DEBUG_LOG(info->line, "num expired: %i\n", serial_fast_timer_expired));
         check_flush_timeout(info);
 }
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c
index d8d164b82dc3..618c1c1f227e 100644
--- a/drivers/usb/serial/kobil_sct.c
+++ b/drivers/usb/serial/kobil_sct.c
@@ -193,7 +193,7 @@ static int kobil_open(struct tty_struct *tty, struct usb_serial_port *port)
                           KOBIL_TIMEOUT
         );
         dev_dbg(dev, "%s - Send get_HW_version URB returns: %i\n", __func__, result);
-        dev_dbg(dev, "Harware version: %i.%i.%i\n", transfer_buffer[0],
+        dev_dbg(dev, "Hardware version: %i.%i.%i\n", transfer_buffer[0],
                 transfer_buffer[1], transfer_buffer[2]);
 
         /* get firmware version */
diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c
index 025f14e30eed..77b890e4d296 100644
--- a/drivers/video/udlfb.c
+++ b/drivers/video/udlfb.c
@@ -1624,7 +1624,7 @@ static int dlfb_usb_probe(struct usb_interface *interface,
         }
 
         if (pixel_limit) {
-                pr_warn("DL chip limit of %d overriden"
+                pr_warn("DL chip limit of %d overridden"
                         " by module param to %d\n",
                         dev->sku_pixel_limit, pixel_limit);
                 dev->sku_pixel_limit = pixel_limit;
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index c794ea182140..12ba6db65142 100644
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -222,7 +222,7 @@ config XEN_ACPI_PROCESSOR
 
           To do that the driver parses the Power Management data and uploads
           said information to the Xen hypervisor. Then the Xen hypervisor can
-          select the proper Cx and Pxx states. It also registers itslef as the
+          select the proper Cx and Pxx states. It also registers itself as the
           SMM so that other drivers (such as ACPI cpufreq scaling driver) will
           not load.