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:
  fat: fix error message for bogus number of directory entries
  fat: fix typo s/supeblock/superblock/
  ASoC: max9877: Remove unused function declaration
  dw2102: don't output spurious blank lines to the kernel log
  init: fix Kconfig text
  ARM: io: fix comment grammar
  ocfs: fix ocfs2_xattr_user_get() argument name
  scsi/qla2xxx: Remove erroneous unused macro qla82xx_get_temp_val1()

diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
index 781ef5fe235d4924372f0cc37f29c41770f319d4..021692c64de3bf9f55c4625769351fb8b4255e45 100644 (file)
--- a/arch/arm/include/asm/io.h
+++ b/arch/arm/include/asm/io.h
@@ -282,7 +282,7 @@ extern void _memset_io(volatile void __iomem *, int, size_t);
  * These perform PCI memory accesses via an ioremap region.  They don't
  * take an address as such, but a cookie.
  *
- * Again, this are defined to perform little endian accesses.  See the
+ * Again, these are defined to perform little endian accesses.  See the
  * IO port primitives for more information.
  */
 #ifndef readl

diff --git a/drivers/scsi/qla2xxx/qla_nx.h b/drivers/scsi/qla2xxx/qla_nx.h
index 59c477883a7325ba1810dd833e9c03661156ff58..6201dce3553bf951b5b1f770842e289ced553e95 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_nx.h
+++ b/drivers/scsi/qla2xxx/qla_nx.h
@@ -1183,7 +1183,6 @@ static const int MD_MIU_TEST_AGT_RDDATA[] = { 0x410000A8, 0x410000AC,
 #define CRB_NIU_XG_PAUSE_CTL_P1        0x8
 
 #define qla82xx_get_temp_val(x)          ((x) >> 16)
-#define qla82xx_get_temp_val1(x)          ((x) && 0x0000FFFF)
 #define qla82xx_get_temp_state(x)        ((x) & 0xffff)
 #define qla82xx_encode_temp(val, state)  (((val) << 16) | (state))
 

diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 3bcf57925dca80d4cb55565568469aa04b001e9d..da04c0298fab40c1df4d22dd2492ec8d7ef26a4d 100644 (file)
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -1589,7 +1589,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat,
 
        /*
         * GFP_KERNEL is ok here, because while we do hold the
-        * supeblock lock, memory pressure can't call back into
+        * superblock lock, memory pressure can't call back into
         * the filesystem, since we're only just about to mount
         * it and have no inodes etc active!
         */
@@ -1726,7 +1726,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat,
        sbi->dir_entries = bpb.fat_dir_entries;
        if (sbi->dir_entries & (sbi->dir_per_block - 1)) {
                if (!silent)
-                       fat_msg(sb, KERN_ERR, "bogus directory-entries per block"
+                       fat_msg(sb, KERN_ERR, "bogus number of directory entries"
                               " (%u)", sbi->dir_entries);
                goto out_invalid;
        }

diff --git a/fs/ocfs2/xattr.c b/fs/ocfs2/xattr.c
index d2053853951e04182bed402df1817fac262f67da..5bb44f7a78ee812e2deacf76cd1a9d633705f709 100644 (file)
--- a/fs/ocfs2/xattr.c
+++ b/fs/ocfs2/xattr.c
@@ -7344,7 +7344,7 @@ const struct xattr_handler ocfs2_xattr_trusted_handler = {
  * 'user' attributes support
  */
 static int ocfs2_xattr_user_get(const struct xattr_handler *handler,
-                               struct dentry *unusde, struct inode *inode,
+                               struct dentry *unused, struct inode *inode,
                                const char *name, void *buffer, size_t size)
 {
        struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);

diff --git a/init/Kconfig b/init/Kconfig
index 504057925ee9df37a9cfa9cfc200cb1071f1b23d..46f817abff0e60902e3e1b6c1c71b1a8355dc572 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -852,8 +852,8 @@ config LOG_CPU_MAX_BUF_SHIFT
          used as it forces an exact (power of two) size of the ring buffer.
 
          The number of possible CPUs is used for this computation ignoring
-         hotplugging making the compuation optimal for the the worst case
-         scenerio while allowing a simple algorithm to be used from bootup.
+         hotplugging making the computation optimal for the worst case
+         scenario while allowing a simple algorithm to be used from bootup.
 
          Examples shift values and their meaning:
                     17 => 128 KB for each CPU

diff --git a/sound/soc/codecs/max9877.h b/sound/soc/codecs/max9877.h
index 6da72290ac58228799f6e952a9f2eb45186629ac..368343f29dd0fae4be730799a56573b0f56a65c4 100644 (file)
--- a/sound/soc/codecs/max9877.h
+++ b/sound/soc/codecs/max9877.h
@@ -32,6 +32,4 @@
 #define MAX9877_BYPASS                 (1 << 6)
 #define MAX9877_SHDN                   (1 << 7)
 
-extern int max9877_add_controls(struct snd_soc_codec *codec);
-
 #endif