diff --git a/drivers/crypto/ccp/ccp-crypto-aes.c b/drivers/crypto/ccp/ccp-crypto-aes.c
index f302a5b7..c0befdb 100644
--- a/drivers/crypto/ccp/ccp-crypto-aes.c
+++ b/drivers/crypto/ccp/ccp-crypto-aes.c
@@ -341,7 +341,7 @@
 
 	/* Copy the defaults and override as necessary */
 	alg = &ccp_alg->alg;
-	memcpy(alg, def->alg_defaults, sizeof(*alg));
+	*alg = *def->alg_defaults;
 	snprintf(alg->cra_name, CRYPTO_MAX_ALG_NAME, "%s", def->name);
 	snprintf(alg->cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s",
 		 def->driver_name);
diff --git a/drivers/crypto/ccp/ccp-crypto-sha.c b/drivers/crypto/ccp/ccp-crypto-sha.c
index 44ff00a..a6ef183 100644
--- a/drivers/crypto/ccp/ccp-crypto-sha.c
+++ b/drivers/crypto/ccp/ccp-crypto-sha.c
@@ -395,7 +395,7 @@
 		return -ENOMEM;
 
 	/* Copy the base algorithm and only change what's necessary */
-	memcpy(ccp_alg, base_alg, sizeof(*ccp_alg));
+	*ccp_alg = *base_alg;
 	INIT_LIST_HEAD(&ccp_alg->entry);
 
 	strncpy(ccp_alg->child_alg, def->name, CRYPTO_MAX_ALG_NAME);
diff --git a/drivers/crypto/ccp/ccp-dev.c b/drivers/crypto/ccp/ccp-dev.c
index de59df9..b2038a7 100644
--- a/drivers/crypto/ccp/ccp-dev.c
+++ b/drivers/crypto/ccp/ccp-dev.c
@@ -562,7 +562,7 @@
 			return -ENODEV;
 		return ccp_pci_init();
 		break;
-	};
+	}
 
 	return -ENODEV;
 }
@@ -575,7 +575,7 @@
 	case 22:
 		ccp_pci_exit();
 		break;
-	};
+	}
 }
 
 module_init(ccp_mod_init);