Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[karo-tx-linux.git] / mm / zswap.c

diff --git a/mm/zswap.c b/mm/zswap.c
index eedc27894b1013187cc81831e956e4c8344b5176..d39581a076c3aed1e9db7b2408c3f8da9ef60415 100644 (file)
--- a/mm/zswap.c
+++ b/mm/zswap.c
@@ -371,10 +371,9 @@ static int zswap_dstmem_prepare(unsigned int cpu)
        u8 *dst;
 
        dst = kmalloc_node(PAGE_SIZE * 2, GFP_KERNEL, cpu_to_node(cpu));
-       if (!dst) {
-               pr_err("can't allocate compressor buffer\n");
+       if (!dst)
                return -ENOMEM;
-       }
+
        per_cpu(zswap_dstmem, cpu) = dst;
        return 0;
 }
@@ -515,10 +514,8 @@ static struct zswap_pool *zswap_pool_create(char *type, char *compressor)
        }
 
        pool = kzalloc(sizeof(*pool), GFP_KERNEL);
-       if (!pool) {
-               pr_err("pool alloc failed\n");
+       if (!pool)
                return NULL;
-       }
 
        /* unique name for each pool specifically required by zsmalloc */
        snprintf(name, 38, "zswap%x", atomic_inc_return(&zswap_pools_count));
@@ -1158,7 +1155,7 @@ static void zswap_frontswap_init(unsigned type)
 {
        struct zswap_tree *tree;
 
-       tree = kzalloc(sizeof(struct zswap_tree), GFP_KERNEL);
+       tree = kzalloc(sizeof(*tree), GFP_KERNEL);
        if (!tree) {
                pr_err("alloc failed, zswap disabled for swap type %d\n", type);
                return;