Commit-ID: 24fa9a9d6d70ef7ef7087dce472a8f43a9078da5 Gitweb: http://git.kernel.org/tip/24fa9a9d6d70ef7ef7087dce472a8f43a9078da5 Author: Matt Fleming <matt.fleming@xxxxxxxxx> AuthorDate: Tue, 28 Feb 2012 13:37:25 +0000 Committer: H. Peter Anvin <hpa@xxxxxxxxx> CommitDate: Tue, 28 Feb 2012 10:23:18 -0800 USB: ffs-test: Don't duplicate {get,put}_unaligned*() functions Use the header file in tools/include instead of duplicating the endian functions. Cc: Davidlohr Bueso <dave@xxxxxxx> Acked-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Matt Fleming <matt.fleming@xxxxxxxxx> Link: http://lkml.kernel.org/r/1330436245-24875-7-git-send-email-matt@xxxxxxxxxxxxxxxxx Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx> --- tools/usb/Makefile | 2 +- tools/usb/ffs-test.c | 29 +---------------------------- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/tools/usb/Makefile b/tools/usb/Makefile index 8b704af..396d6c4 100644 --- a/tools/usb/Makefile +++ b/tools/usb/Makefile @@ -3,7 +3,7 @@ CC = $(CROSS_COMPILE)gcc PTHREAD_LIBS = -lpthread WARNINGS = -Wall -Wextra -CFLAGS = $(WARNINGS) -g $(PTHREAD_LIBS) +CFLAGS = $(WARNINGS) -g $(PTHREAD_LIBS) -I../include all: testusb ffs-test %: %.c diff --git a/tools/usb/ffs-test.c b/tools/usb/ffs-test.c index b9c7986..384f47a 100644 --- a/tools/usb/ffs-test.c +++ b/tools/usb/ffs-test.c @@ -36,6 +36,7 @@ #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> +#include <tools/le_byteshift.h> #include "../../include/linux/usb/functionfs.h" @@ -47,34 +48,6 @@ #define le32_to_cpu(x) le32toh(x) #define le16_to_cpu(x) le16toh(x) -static inline __u16 get_unaligned_le16(const void *_ptr) -{ - const __u8 *ptr = _ptr; - return ptr[0] | (ptr[1] << 8); -} - -static inline __u32 get_unaligned_le32(const void *_ptr) -{ - const __u8 *ptr = _ptr; - return ptr[0] | (ptr[1] << 8) | (ptr[2] << 16) | (ptr[3] << 24); -} - -static inline void put_unaligned_le16(__u16 val, void *_ptr) -{ - __u8 *ptr = _ptr; - *ptr++ = val; - *ptr++ = val >> 8; -} - -static inline void put_unaligned_le32(__u32 val, void *_ptr) -{ - __u8 *ptr = _ptr; - *ptr++ = val; - *ptr++ = val >> 8; - *ptr++ = val >> 16; - *ptr++ = val >> 24; -} - /******************** Messages and Errors ***********************************/ -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html