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

Pull trivial tree updates from Jiri Kosina.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
  floppy: make local variable non-static
  exynos: fixes an incorrect header guard
  dt-bindings: fixes some incorrect header guards
  cpufreq-dt: correct dead link in documentation
  cpufreq: ARM big LITTLE: correct dead link in documentation
  treewide: Fix typos in printk
  Documentation: filesystem: Fix typo in fs/eventfd.c
  fs/super.c: use && instead of & for warn_on condition
  Documentation: fix sysfs-ptp
  lib: scatterlist: fix Kconfig description

diff --git a/Documentation/ABI/testing/sysfs-ptp b/Documentation/ABI/testing/sysfs-ptp
index 44806a678f12a21a3ff149bc1b7838a4c14da602..a17f817a93095b22f12b9aff657c0dd50c845fc7 100644 (file)
--- a/Documentation/ABI/testing/sysfs-ptp
+++ b/Documentation/ABI/testing/sysfs-ptp
@@ -74,7 +74,7 @@ Description:
                assignment may be changed by two writing numbers into
                the file.
 
-What:          /sys/class/ptp/ptpN/pps_avaiable
+What:          /sys/class/ptp/ptpN/pps_available
 Date:          September 2010
 Contact:       Richard Cochran <richardcochran@gmail.com>
 Description:

diff --git a/Documentation/devicetree/bindings/cpufreq/arm_big_little_dt.txt b/Documentation/devicetree/bindings/cpufreq/arm_big_little_dt.txt
index 0715695e94a98575f0db40ad3dcc21549cfcc1f3..2aa06ac0fac594ae48b85041fd1c3aed21f674ba 100644 (file)
--- a/Documentation/devicetree/bindings/cpufreq/arm_big_little_dt.txt
+++ b/Documentation/devicetree/bindings/cpufreq/arm_big_little_dt.txt
@@ -12,7 +12,7 @@ must be present contiguously. Generic DT driver will check only node 'x' for
 cpu:x.
 
 Required properties:
-- operating-points: Refer to Documentation/devicetree/bindings/power/opp.txt
+- operating-points: Refer to Documentation/devicetree/bindings/opp/opp.txt
   for details
 
 Optional properties:

diff --git a/Documentation/devicetree/bindings/cpufreq/cpufreq-dt.txt b/Documentation/devicetree/bindings/cpufreq/cpufreq-dt.txt
index e41c98ffbccb2a53e408e83b9886ec6e56713557..dd3929e85decc562e5621cf99ac408033a5930f9 100644 (file)
--- a/Documentation/devicetree/bindings/cpufreq/cpufreq-dt.txt
+++ b/Documentation/devicetree/bindings/cpufreq/cpufreq-dt.txt
@@ -11,7 +11,7 @@ Required properties:
 - None
 
 Optional properties:
-- operating-points: Refer to Documentation/devicetree/bindings/power/opp.txt for
+- operating-points: Refer to Documentation/devicetree/bindings/opp/opp.txt for
   details. OPPs *must* be supplied either via DT, i.e. this property, or
   populated at runtime.
 - clock-latency: Specify the possible maximum transition latency for clock,

diff --git a/Documentation/sysctl/vm.txt b/Documentation/sysctl/vm.txt
index f72370b440b121e718183ea6a7dbb9bafc2dcc25..8ee925c046aa67c12a07a9c3eb9f1d4b1c812dc2 100644 (file)
--- a/Documentation/sysctl/vm.txt
+++ b/Documentation/sysctl/vm.txt
@@ -135,7 +135,7 @@ Contains, as a percentage of total available memory that contains free pages
 and reclaimable pages, the number of pages at which the background kernel
 flusher threads will start writing out dirty data.
 
-The total avaiable memory is not equal to total system memory.
+The total available memory is not equal to total system memory.
 
 ==============================================================
 
@@ -170,7 +170,7 @@ Contains, as a percentage of total available memory that contains free pages
 and reclaimable pages, the number of pages at which a process which is
 generating disk writes will itself start writing out dirty data.
 
-The total avaiable memory is not equal to total system memory.
+The total available memory is not equal to total system memory.
 
 ==============================================================
 

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 331363e7de0f1d5682d7ca2756c2e2e59cbabbe4..9e251201dd48ef2a850b8069edf7ffc05be98a4e 100644 (file)
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -3585,7 +3585,7 @@ static void __init config_types(void)
                unsigned int type = UDP->cmos;
                struct floppy_drive_params *params;
                const char *name = NULL;
-               static char temparea[32];
+               char temparea[32];
 
                if (type < ARRAY_SIZE(default_drive_params)) {
                        params = &default_drive_params[type].params;
@@ -3596,7 +3596,8 @@ static void __init config_types(void)
                                allowed_drive_mask &= ~(1 << drive);
                } else {
                        params = &default_drive_params[0].params;
-                       sprintf(temparea, "unknown type %d (usb?)", type);
+                       snprintf(temparea, sizeof(temparea),
+                                "unknown type %d (usb?)", type);
                        name = temparea;
                }
                if (name) {

diff --git a/drivers/firmware/efi/libstub/fdt.c b/drivers/firmware/efi/libstub/fdt.c
index b62e2f5dcab3b2d95074b534de803915145dc20c..cf7b7d46302a269839c8932f9d8866b93a814699 100644 (file)
--- a/drivers/firmware/efi/libstub/fdt.c
+++ b/drivers/firmware/efi/libstub/fdt.c
@@ -253,7 +253,7 @@ efi_status_t allocate_new_fdt_and_exit_boot(efi_system_table_t *sys_table,
                        sys_table->boottime->free_pool(memory_map);
                        new_fdt_size += EFI_PAGE_SIZE;
                } else {
-                       pr_efi_err(sys_table, "Unable to constuct new device tree.\n");
+                       pr_efi_err(sys_table, "Unable to construct new device tree.\n");
                        goto fail_free_mmap;
                }
        }

diff --git a/drivers/gpu/drm/exynos/exynos_drm_fb.h b/drivers/gpu/drm/exynos/exynos_drm_fb.h
index 726a2d44371ff09ccd39060e482913cdd059f4ae..cf39f9816a87624677909cb3a4affe553c900491 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_fb.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_fb.h
@@ -12,7 +12,7 @@
  */
 
 #ifndef _EXYNOS_DRM_FB_H_
-#define _EXYNOS_DRM_FB_H
+#define _EXYNOS_DRM_FB_H_
 
 #include "exynos_drm_gem.h"
 

diff --git a/drivers/infiniband/hw/cxgb4/cm.c b/drivers/infiniband/hw/cxgb4/cm.c
index c9cffced00ca1df11683b961d0cc48f983056a07..326d07d823a5e62f0ee206b8c5f5865f7f97c08d 100644 (file)
--- a/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
@@ -449,7 +449,7 @@ static void act_open_req_arp_failure(void *handle, struct sk_buff *skb)
 {
        struct c4iw_ep *ep = handle;
 
-       printk(KERN_ERR MOD "ARP failure duing connect\n");
+       printk(KERN_ERR MOD "ARP failure during connect\n");
        kfree_skb(skb);
        connect_reply_upcall(ep, -EHOSTUNREACH);
        state_set(&ep->com, DEAD);

diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index f8e5db0cb5aaae3038e67ec9f348f1faa4c64508..2ea12c6bf65997895e26a89fe8977451ae438d97 100644 (file)
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -549,13 +549,13 @@ static void *raid0_takeover_raid10(struct mddev *mddev)
         *  - all mirrors must be already degraded
         */
        if (mddev->layout != ((1 << 8) + 2)) {
-               printk(KERN_ERR "md/raid0:%s:: Raid0 cannot takover layout: 0x%x\n",
+               printk(KERN_ERR "md/raid0:%s:: Raid0 cannot takeover layout: 0x%x\n",
                       mdname(mddev),
                       mddev->layout);
                return ERR_PTR(-EINVAL);
        }
        if (mddev->raid_disks & 1) {
-               printk(KERN_ERR "md/raid0:%s: Raid0 cannot takover Raid10 with odd disk number.\n",
+               printk(KERN_ERR "md/raid0:%s: Raid0 cannot takeover Raid10 with odd disk number.\n",
                       mdname(mddev));
                return ERR_PTR(-EINVAL);
        }

diff --git a/drivers/media/common/saa7146/saa7146_video.c b/drivers/media/common/saa7146/saa7146_video.c
index d5837be3e8cfe846cf8c6a24bb3a7acb8f777ad7..ea2f3bf7368b85fe85d638212ae4ec7f658d3959 100644 (file)
--- a/drivers/media/common/saa7146/saa7146_video.c
+++ b/drivers/media/common/saa7146/saa7146_video.c
@@ -502,7 +502,7 @@ static int vidioc_s_fbuf(struct file *file, void *fh, const struct v4l2_framebuf
        /* check if overlay is running */
        if (IS_OVERLAY_ACTIVE(fh) != 0) {
                if (vv->video_fh != fh) {
-                       DEB_D("refusing to change framebuffer informations while overlay is active in another open\n");
+                       DEB_D("refusing to change framebuffer information while overlay is active in another open\n");
                        return -EBUSY;
                }
        }

diff --git a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontends/m88ds3103.c
index feeeb70d841ed92a485e4ec630b1133d51c75291..ce73a5ec6036b3d8930bbda47ac2c4d93a233c6c 100644 (file)
--- a/drivers/media/dvb-frontends/m88ds3103.c
+++ b/drivers/media/dvb-frontends/m88ds3103.c
@@ -685,7 +685,7 @@ static int m88ds3103_init(struct dvb_frontend *fe)
        /* request the firmware, this will block and timeout */
        ret = request_firmware(&fw, fw_file, &client->dev);
        if (ret) {
-               dev_err(&client->dev, "firmare file '%s' not found\n", fw_file);
+               dev_err(&client->dev, "firmware file '%s' not found\n", fw_file);
                goto err;
        }
 

diff --git a/drivers/media/dvb-frontends/si2165.c b/drivers/media/dvb-frontends/si2165.c
index 1cf6e52e010512123af9d5fb39491d97c1f63522..2b93241d4bc102618c722107477b08482c7d86bb 100644 (file)
--- a/drivers/media/dvb-frontends/si2165.c
+++ b/drivers/media/dvb-frontends/si2165.c
@@ -541,7 +541,7 @@ static int si2165_upload_firmware(struct si2165_state *state)
                                           &offset, block_count);
        if (ret < 0) {
                dev_err(&state->i2c->dev,
-                       "%s: firmare could not be uploaded\n",
+                       "%s: firmware could not be uploaded\n",
                        KBUILD_MODNAME);
                goto error;
        }
@@ -565,7 +565,7 @@ static int si2165_upload_firmware(struct si2165_state *state)
 
        if (len != offset) {
                dev_err(&state->i2c->dev,
-                       "%s: firmare len mismatch %04x != %04x\n",
+                       "%s: firmware len mismatch %04x != %04x\n",
                        KBUILD_MODNAME, len, offset);
                ret = -EINVAL;
                goto error;

diff --git a/drivers/media/pci/netup_unidvb/netup_unidvb_core.c b/drivers/media/pci/netup_unidvb/netup_unidvb_core.c
index 81e1a5e26efb62b50cf1c6e77d20ec653d36729f..525ebfefeee829c644a74d279d888a7fc60e9ca3 100644 (file)
--- a/drivers/media/pci/netup_unidvb/netup_unidvb_core.c
+++ b/drivers/media/pci/netup_unidvb/netup_unidvb_core.c
@@ -387,7 +387,7 @@ static int netup_unidvb_dvb_init(struct netup_unidvb_dev *ndev,
                vb2_dvb_alloc_frontend(
                        &ndev->frontends[num], 3) == NULL) {
                dev_dbg(&ndev->pci_dev->dev,
-                       "%s(): unable to to alllocate vb2_dvb_frontend\n",
+                       "%s(): unable to allocate vb2_dvb_frontend\n",
                        __func__);
                return -ENOMEM;
        }

diff --git a/drivers/net/ethernet/intel/i40evf/i40evf_main.c b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
index a0bbb6b9f5aa460d104bbbd6ca876c32b4ee193c..94da913b151da615f751d287b33a65de92d95829 100644 (file)
--- a/drivers/net/ethernet/intel/i40evf/i40evf_main.c
+++ b/drivers/net/ethernet/intel/i40evf/i40evf_main.c
@@ -1239,7 +1239,7 @@ static int i40evf_config_rss_aq(struct i40e_vsi *vsi, const u8 *seed,
 
        if (adapter->current_op != I40E_VIRTCHNL_OP_UNKNOWN) {
                /* bail because we already have a command pending */
-               dev_err(&adapter->pdev->dev, "Cannot confiure RSS, command %d pending\n",
+               dev_err(&adapter->pdev->dev, "Cannot configure RSS, command %d pending\n",
                        adapter->current_op);
                return -EBUSY;
        }

diff --git a/drivers/soc/ti/knav_dma.c b/drivers/soc/ti/knav_dma.c
index bc1b80ec6afe32a3ac6df7c0e238972531988764..1a7b5caa127b55ca58275520fd71fa368ae91eea 100644 (file)
--- a/drivers/soc/ti/knav_dma.c
+++ b/drivers/soc/ti/knav_dma.c
@@ -389,7 +389,7 @@ static int of_channel_match_helper(struct device_node *np, const char *name,
        *dma_instance = dma_node->name;
        index = of_property_match_string(np, "ti,navigator-dma-names", name);
        if (index < 0) {
-               dev_err(kdev->dev, "No 'ti,navigator-dma-names' propery\n");
+               dev_err(kdev->dev, "No 'ti,navigator-dma-names' property\n");
                return -ENODEV;
        }
 

diff --git a/fs/eventfd.c b/fs/eventfd.c
index 8d0c0df018549b86b9759225c2aa2ef88a5728dc..ed70cf9fdc7b3aa4e3ae6295f6071aaf87501ca7 100644 (file)
--- a/fs/eventfd.c
+++ b/fs/eventfd.c
@@ -45,10 +45,10 @@ struct eventfd_ctx {
  *
  * This function is supposed to be called by the kernel in paths that do not
  * allow sleeping. In this function we allow the counter to reach the ULLONG_MAX
- * value, and we signal this as overflow condition by returining a POLLERR
+ * value, and we signal this as overflow condition by returning a POLLERR
  * to poll(2).
  *
- * Returns the amount by which the counter was incrememnted.  This will be less
+ * Returns the amount by which the counter was incremented.  This will be less
  * than @n if the counter has overflowed.
  */
 __u64 eventfd_signal(struct eventfd_ctx *ctx, __u64 n)

diff --git a/fs/super.c b/fs/super.c
index cc658a20a29e10dc829ed4bdfe648a7acf1d7331..1182af8fd5ff3ede7459305440d50178821c061b 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -1197,7 +1197,7 @@ int __sb_start_write(struct super_block *sb, int level, bool wait)
        else
                ret = percpu_down_read_trylock(sb->s_writers.rw_sem + level-1);
 
-       WARN_ON(force_trylock & !ret);
+       WARN_ON(force_trylock && !ret);
        return ret;
 }
 EXPORT_SYMBOL(__sb_start_write);

diff --git a/include/dt-bindings/leds/common.h b/include/dt-bindings/leds/common.h
index 79fcef72ef57e2fea3a5a03ecdfce253079f1cf1..7958bec7de8c1f8a27d75ba4e85900f21603ae09 100644 (file)
--- a/include/dt-bindings/leds/common.h
+++ b/include/dt-bindings/leds/common.h
@@ -6,7 +6,7 @@
  * Author: Jacek Anaszewski <j.anaszewski@samsung.com>
  */
 
-#ifndef __DT_BINDINGS_LEDS_H__
+#ifndef __DT_BINDINGS_LEDS_H
 #define __DT_BINDINGS_LEDS_H
 
 /* External trigger type */

diff --git a/include/dt-bindings/mfd/palmas.h b/include/dt-bindings/mfd/palmas.h
index 2c8ac48413857d82394dd04428fdcb68b88dae76..cdb075aae4e1abdef5b26ae8b988850abed781ae 100644 (file)
--- a/include/dt-bindings/mfd/palmas.h
+++ b/include/dt-bindings/mfd/palmas.h
@@ -7,7 +7,7 @@
  *
  */
 
-#ifndef __DT_BINDINGS_PALMAS_H__
+#ifndef __DT_BINDINGS_PALMAS_H
 #define __DT_BINDINGS_PALMAS_H
 
 /* External control pins */

diff --git a/lib/Kconfig b/lib/Kconfig
index f0df318104e7272ef97641421c938069a047a85e..5a0c1c83cdf0af97ea9446657b3527dc1e206d45 100644 (file)
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -512,9 +512,9 @@ source "lib/fonts/Kconfig"
 config SG_SPLIT
        def_bool n
        help
-        Provides a heler to split scatterlists into chunks, each chunk being a
-        scatterlist. This should be selected by a driver or an API which
-        whishes to split a scatterlist amongst multiple DMA channel.
+        Provides a helper to split scatterlists into chunks, each chunk being
+        a scatterlist. This should be selected by a driver or an API which
+        whishes to split a scatterlist amongst multiple DMA channels.
 
 #
 # sg chaining option

diff --git a/sound/drivers/pcm-indirect2.c b/sound/drivers/pcm-indirect2.c
index e73fafd761b35c829c90e3443388e5dcf17e06df..d16bc14a0f0e75286b1d93ade9527605714aef60 100644 (file)
--- a/sound/drivers/pcm-indirect2.c
+++ b/sound/drivers/pcm-indirect2.c
@@ -47,7 +47,7 @@ void snd_pcm_indirect2_stat(struct snd_pcm_substream *substream,
        int seconds = (rec->lastbytetime - rec->firstbytetime) / HZ;
 
        snd_printk(KERN_DEBUG "STAT: mul_elapsed: %u, mul_elapsed_real: %d, "
-                  "irq_occured: %d\n",
+                  "irq_occurred: %d\n",
                   rec->mul_elapsed, rec->mul_elapsed_real, rec->irq_occured);
        snd_printk(KERN_DEBUG "STAT: min_multiple: %d (irqs/period)\n",
                   rec->min_multiple);

diff --git a/sound/usb/6fire/firmware.c b/sound/usb/6fire/firmware.c
index 62c25e74f0e52542b06acd2f57e47164d408d56d..9520b4cd703853cf4f5672c37da344ee3b214cbc 100644 (file)
--- a/sound/usb/6fire/firmware.c
+++ b/sound/usb/6fire/firmware.c
@@ -350,7 +350,7 @@ static int usb6fire_fw_check(struct usb_interface *intf, const u8 *version)
                if (!memcmp(version, known_fw_versions + i, 2))
                        return 0;
 
-       dev_err(&intf->dev, "invalid fimware version in device: %4ph. "
+       dev_err(&intf->dev, "invalid firmware version in device: %4ph. "
                        "please reconnect to power. if this failure "
                        "still happens, check your firmware installation.",
                        version);