These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / gdm724x / gdm_endian.c

diff --git a/kernel/drivers/staging/gdm724x/gdm_endian.c b/kernel/drivers/staging/gdm724x/gdm_endian.c
index f6cc90a..d7144e7 100644 (file)
--- a/kernel/drivers/staging/gdm724x/gdm_endian.c
+++ b/kernel/drivers/staging/gdm724x/gdm_endian.c
@@ -11,57 +11,45 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/slab.h>
+#include <linux/kernel.h>
 #include "gdm_endian.h"
 
 void gdm_set_endian(struct gdm_endian *ed, u8 dev_endian)
 {
-       u8 a[2] = {0x12, 0x34};
-       u8 b[2] = {0, };
-       u16 c = 0x1234;
-
        if (dev_endian == ENDIANNESS_BIG)
                ed->dev_ed = ENDIANNESS_BIG;
        else
                ed->dev_ed = ENDIANNESS_LITTLE;
-
-       memcpy(b, &c, 2);
-
-       if (a[0] != b[0])
-               ed->host_ed = ENDIANNESS_LITTLE;
-       else
-               ed->host_ed = ENDIANNESS_BIG;
-
 }
 
 u16 gdm_cpu_to_dev16(struct gdm_endian *ed, u16 x)
 {
-       if (ed->dev_ed == ed->host_ed)
-               return x;
-
-       return Endian16_Swap(x);
+       if (ed->dev_ed == ENDIANNESS_LITTLE)
+               return cpu_to_le16(x);
+       else
+               return cpu_to_be16(x);
 }
 
 u16 gdm_dev16_to_cpu(struct gdm_endian *ed, u16 x)
 {
-       if (ed->dev_ed == ed->host_ed)
-               return x;
-
-       return Endian16_Swap(x);
+       if (ed->dev_ed == ENDIANNESS_LITTLE)
+               return le16_to_cpu(x);
+       else
+               return be16_to_cpu(x);
 }
 
 u32 gdm_cpu_to_dev32(struct gdm_endian *ed, u32 x)
 {
-       if (ed->dev_ed == ed->host_ed)
-               return x;
-
-       return Endian32_Swap(x);
+       if (ed->dev_ed == ENDIANNESS_LITTLE)
+               return cpu_to_le32(x);
+       else
+               return cpu_to_be32(x);
 }
 
 u32 gdm_dev32_to_cpu(struct gdm_endian *ed, u32 x)
 {
-       if (ed->dev_ed == ed->host_ed)
-               return x;
-
-       return Endian32_Swap(x);
+       if (ed->dev_ed == ENDIANNESS_LITTLE)
+               return le32_to_cpu(x);
+       else
+               return be32_to_cpu(x);
 }