diff --git a/lib/libzfs/libzfs_pool.c b/lib/libzfs/libzfs_pool.c
index cd7062a88c..83fab04336 100644
--- a/lib/libzfs/libzfs_pool.c
+++ b/lib/libzfs/libzfs_pool.c
@@ -5184,7 +5184,7 @@ zpool_get_vdev_prop(zpool_handle_t *zhp, const char *vdevname, vdev_prop_t prop,
 {
 	nvlist_t *reqnvl, *reqprops;
 	nvlist_t *retprops = NULL;
-	uint64_t vdev_guid;
+	uint64_t vdev_guid = 0;
 	int ret;
 
 	if ((ret = zpool_vdev_guid(zhp, vdevname, &vdev_guid)) != 0)
@@ -5243,7 +5243,7 @@ zpool_get_all_vdev_props(zpool_handle_t *zhp, const char *vdevname,
     nvlist_t **outnvl)
 {
 	nvlist_t *nvl = NULL;
-	uint64_t vdev_guid;
+	uint64_t vdev_guid = 0;
 	int ret;
 
 	if ((ret = zpool_vdev_guid(zhp, vdevname, &vdev_guid)) != 0)
diff --git a/module/icp/algs/edonr/edonr.c b/module/icp/algs/edonr/edonr.c
index 6f3a43e263..9388a6f6b7 100644
--- a/module/icp/algs/edonr/edonr.c
+++ b/module/icp/algs/edonr/edonr.c
@@ -47,10 +47,7 @@
 #define	hashState384(x)	((x)->pipe->p512)
 #define	hashState512(x)	((x)->pipe->p512)
 
-/* shift and rotate shortcuts */
-#define	shl(x, n)	((x) << n)
-#define	shr(x, n)	((x) >> n)
-
+/* rotate shortcuts */
 #define	rotl32(x, n)	(((x) << (n)) | ((x) >> (32 - (n))))
 #define	rotr32(x, n)	(((x) >> (n)) | ((x) << (32 - (n))))