Merge https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq

[platform/kernel/u-boot.git] / drivers / crypto / fsl / desc_constr.h

diff --git a/drivers/crypto/fsl/desc_constr.h b/drivers/crypto/fsl/desc_constr.h
index 7dad753..b82ba83 100644 (file)
--- a/drivers/crypto/fsl/desc_constr.h
+++ b/drivers/crypto/fsl/desc_constr.h
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * caam descriptor construction helper functions
  *
  * Copyright 2008-2014 Freescale Semiconductor, Inc.
  *
- * SPDX-License-Identifier:    GPL-2.0+
- *
  * Based on desc_constr.h file in linux drivers/crypto/caam
  */
 
@@ -37,19 +36,16 @@
                               (LDOFF_ENABLE_AUTO_NFIFO << LDST_OFFSET_SHIFT))
 
 #ifdef CONFIG_PHYS_64BIT
-union ptr_addr_t {
-       u64 m_whole;
-       struct {
+struct ptr_addr_t {
 #ifdef CONFIG_SYS_FSL_SEC_LE
-               u32 low;
-               u32 high;
+       u32 low;
+       u32 high;
 #elif defined(CONFIG_SYS_FSL_SEC_BE)
-               u32 high;
-               u32 low;
+       u32 high;
+       u32 low;
 #else
 #error Neither CONFIG_SYS_FSL_SEC_LE nor CONFIG_SYS_FSL_SEC_BE is defined
 #endif
-       } m_halfs;
 };
 #endif
 
@@ -58,9 +54,10 @@ static inline void pdb_add_ptr(dma_addr_t *offset, dma_addr_t ptr)
 #ifdef CONFIG_PHYS_64BIT
        /* The Position of low and high part of 64 bit address
         * will depend on the endianness of CAAM Block */
-       union ptr_addr_t *ptr_addr = (union ptr_addr_t *)offset;
-       ptr_addr->m_halfs.high = (u32)(ptr >> 32);
-       ptr_addr->m_halfs.low = (u32)ptr;
+       struct ptr_addr_t *ptr_addr = (struct ptr_addr_t *)offset;
+
+       ptr_addr->high = (u32)(ptr >> 32);
+       ptr_addr->low = (u32)ptr;
 #else
        *offset = ptr;
 #endif
@@ -112,9 +109,10 @@ static inline void append_ptr(u32 *desc, dma_addr_t ptr)
 #ifdef CONFIG_PHYS_64BIT
        /* The Position of low and high part of 64 bit address
         * will depend on the endianness of CAAM Block */
-       union ptr_addr_t *ptr_addr = (union ptr_addr_t *)offset;
-       ptr_addr->m_halfs.high = (u32)(ptr >> 32);
-       ptr_addr->m_halfs.low = (u32)ptr;
+       struct ptr_addr_t *ptr_addr = (struct ptr_addr_t *)offset;
+
+       ptr_addr->high = (u32)(ptr >> 32);
+       ptr_addr->low = (u32)ptr;
 #else
        *offset = ptr;
 #endif