diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-02-28 13:37:25 +0000 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-02-28 10:23:18 -0800 |
| commit | 24fa9a9d6d70ef7ef7087dce472a8f43a9078da5 (patch) | |
| tree | f18c93a77027649176327c9e5f66bca3783f6ca6 /tools/usb | |
| parent | 92f42c50f227ad228f815a8f4eec872524dae3a5 (diff) | |
| download | lwn-24fa9a9d6d70ef7ef7087dce472a8f43a9078da5.tar.gz lwn-24fa9a9d6d70ef7ef7087dce472a8f43a9078da5.zip | |
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@gnu.org>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Link: http://lkml.kernel.org/r/1330436245-24875-7-git-send-email-matt@console-pimps.org
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'tools/usb')
| -rw-r--r-- | tools/usb/Makefile | 2 | ||||
| -rw-r--r-- | tools/usb/ffs-test.c | 29 |
2 files changed, 2 insertions, 29 deletions
diff --git a/tools/usb/Makefile b/tools/usb/Makefile index 8b704af14349..396d6c44e9d7 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 b9c798631699..384f47a5727f 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 ***********************************/ |