Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 6f0168d2dacd7972d887e1ca27943ef8af7512a5

Authored by Harvey Harrison
Committed by Jiri Kosina
1 parent 9063974cdb
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

HID: use get/put_unaligned_* helpers 

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

Showing 1 changed file with 5 additions and 5 deletions Side-by-side Diff

drivers/hid/hid-core.c
Diff comments   View file @ 6f0168d
... ... @@ -780,7 +780,7 @@
780 780 */
781 781 static __inline__ void implement(__u8 *report, unsigned offset, unsigned n, __u32 value)
782 782 {
783   - __le64 x;
  783 + u64 x;
784 784 u64 m = (1ULL << n) - 1;
785 785  
786 786 if (n > 32)
... ... @@ -796,10 +796,10 @@
796 796 report += offset >> 3;
797 797 offset &= 7;
798 798  
799   - x = get_unaligned((__le64 *)report);
800   - x &= cpu_to_le64(~(m << offset));
801   - x |= cpu_to_le64(((u64) value) << offset);
802   - put_unaligned(x, (__le64 *) report);
  799 + x = get_unaligned_le64(report);
  800 + x &= ~(m << offset);
  801 + x |= ((u64)value) << offset;
  802 + put_unaligned_le64(x, report);
803 803 }
804 804  
805 805 /*