Skip to content

Commit

Permalink
crypto: xor - Fix warning when XOR_SELECT_TEMPLATE is unset
Browse files Browse the repository at this point in the history
This patch fixes an unused label warning triggered when the macro
XOR_SELECT_TEMPLATE is not set.

Fixes: 39457ac ("crypto: xor - skip speed test if the xor...")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Suggested-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  • Loading branch information
herbertx committed Aug 31, 2016
1 parent 85962d2 commit 27c4d54
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions crypto/xor.c
Expand Up @@ -24,6 +24,10 @@
#include <linux/preempt.h>
#include <asm/xor.h>

#ifndef XOR_SELECT_TEMPLATE
#define XOR_SELECT_TEMPLATE(x) (x)
#endif

/* The xor routines to use. */
static struct xor_block_template *active_template;

Expand Down Expand Up @@ -109,17 +113,14 @@ calibrate_xor_blocks(void)
void *b1, *b2;
struct xor_block_template *f, *fastest;

fastest = NULL;
fastest = XOR_SELECT_TEMPLATE(NULL);

#ifdef XOR_SELECT_TEMPLATE
fastest = XOR_SELECT_TEMPLATE(fastest);
if (fastest) {
printk(KERN_INFO "xor: automatically using best "
"checksumming function %-10s\n",
fastest->name);
goto out;
}
#endif

/*
* Note: Since the memory is not actually used for _anything_ but to
Expand Down

0 comments on commit 27c4d54

Please sign in to comment.