Merge tag 'irqchip-4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core

Merge the first drop of irqchip updates for 4.9 from Marc Zyngier:

- ACPI IORT core code
- IORT support for the GICv3 ITS
- A few of GIC cleanups

1 files changed, 17 insertions, 7 deletions

diff --git a/crypto/algapi.c b/crypto/algapi.c
index 731255a6104f..df939b54b09f 100644
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -811,6 +811,21 @@ int crypto_attr_u32(struct rtattr *rta, u32 *num)
 }
 EXPORT_SYMBOL_GPL(crypto_attr_u32);
 
+int crypto_inst_setname(struct crypto_instance *inst, const char *name,
+                        struct crypto_alg *alg)
+{
+        if (snprintf(inst->alg.cra_name, CRYPTO_MAX_ALG_NAME, "%s(%s)", name,
+                     alg->cra_name) >= CRYPTO_MAX_ALG_NAME)
+                return -ENAMETOOLONG;
+
+        if (snprintf(inst->alg.cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s(%s)",
+                     name, alg->cra_driver_name) >= CRYPTO_MAX_ALG_NAME)
+                return -ENAMETOOLONG;
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(crypto_inst_setname);
+
 void *crypto_alloc_instance2(const char *name, struct crypto_alg *alg,
                              unsigned int head)
 {
@@ -825,13 +840,8 @@ void *crypto_alloc_instance2(const char *name, struct crypto_alg *alg,
 
         inst = (void *)(p + head);
 
-        err = -ENAMETOOLONG;
-        if (snprintf(inst->alg.cra_name, CRYPTO_MAX_ALG_NAME, "%s(%s)", name,
-                     alg->cra_name) >= CRYPTO_MAX_ALG_NAME)
-                goto err_free_inst;
-
-        if (snprintf(inst->alg.cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s(%s)",
-                     name, alg->cra_driver_name) >= CRYPTO_MAX_ALG_NAME)
+        err = crypto_inst_setname(inst, name, alg);
+        if (err)
                 goto err_free_inst;
 
         return p;