Merge commit 'v3.7-rc1' into stable/for-linus-3.7

* commit 'v3.7-rc1': (10892 commits)
  Linux 3.7-rc1
  x86, boot: Explicitly include autoconf.h for hostprogs
  perf: Fix UAPI fallout
  ARM: config: make sure that platforms are ordered by option string
  ARM: config: sort select statements alphanumerically
  UAPI: (Scripted) Disintegrate include/linux/byteorder
  UAPI: (Scripted) Disintegrate include/linux
  UAPI: Unexport linux/blk_types.h
  UAPI: Unexport part of linux/ppp-comp.h
  perf: Handle new rbtree implementation
  procfs: don't need a PATH_MAX allocation to hold a string representation of an int
  vfs: embed struct filename inside of names_cache allocation if possible
  audit: make audit_inode take struct filename
  vfs: make path_openat take a struct filename pointer
  vfs: turn do_path_lookup into wrapper around struct filename variant
  audit: allow audit code to satisfy getname requests from its names_list
  vfs: define struct filename and have getname() return it
  btrfs: Fix compilation with user namespace support enabled
  userns: Fix posix_acl_file_xattr_userns gid conversion
  userns: Properly print bluetooth socket uids
  ...

1 files changed, 6 insertions, 32 deletions

diff --git a/crypto/tgr192.c b/crypto/tgr192.c
index cbca4f208c9f..87403556fd0b 100644
--- a/crypto/tgr192.c
+++ b/crypto/tgr192.c
@@ -628,7 +628,7 @@ static int tgr128_final(struct shash_desc *desc, u8 * out)
         return 0;
 }
 
-static struct shash_alg tgr192 = {
+static struct shash_alg tgr_algs[3] = { {
         .digestsize     =       TGR192_DIGEST_SIZE,
         .init           =       tgr192_init,
         .update         =       tgr192_update,
@@ -640,9 +640,7 @@ static struct shash_alg tgr192 = {
                 .cra_blocksize  =       TGR192_BLOCK_SIZE,
                 .cra_module     =       THIS_MODULE,
         }
-};
-
-static struct shash_alg tgr160 = {
+}, {
         .digestsize     =       TGR160_DIGEST_SIZE,
         .init           =       tgr192_init,
         .update         =       tgr192_update,
@@ -654,9 +652,7 @@ static struct shash_alg tgr160 = {
                 .cra_blocksize  =       TGR192_BLOCK_SIZE,
                 .cra_module     =       THIS_MODULE,
         }
-};
-
-static struct shash_alg tgr128 = {
+}, {
         .digestsize     =       TGR128_DIGEST_SIZE,
         .init           =       tgr192_init,
         .update         =       tgr192_update,
@@ -668,38 +664,16 @@ static struct shash_alg tgr128 = {
                 .cra_blocksize  =       TGR192_BLOCK_SIZE,
                 .cra_module     =       THIS_MODULE,
         }
-};
+} };
 
 static int __init tgr192_mod_init(void)
 {
-        int ret = 0;
-
-        ret = crypto_register_shash(&tgr192);
-
-        if (ret < 0) {
-                goto out;
-        }
-
-        ret = crypto_register_shash(&tgr160);
-        if (ret < 0) {
-                crypto_unregister_shash(&tgr192);
-                goto out;
-        }
-
-        ret = crypto_register_shash(&tgr128);
-        if (ret < 0) {
-                crypto_unregister_shash(&tgr192);
-                crypto_unregister_shash(&tgr160);
-        }
-      out:
-        return ret;
+        return crypto_register_shashes(tgr_algs, ARRAY_SIZE(tgr_algs));
 }
 
 static void __exit tgr192_mod_fini(void)
 {
-        crypto_unregister_shash(&tgr192);
-        crypto_unregister_shash(&tgr160);
-        crypto_unregister_shash(&tgr128);
+        crypto_unregister_shashes(tgr_algs, ARRAY_SIZE(tgr_algs));
 }
 
 MODULE_ALIAS("tgr160");