diff options
author | Artem Bityutskiy <Artem.Bityutskiy@nokia.com> | 2009-04-21 04:02:01 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-06-05 12:31:38 -0400 |
commit | 24430abc88c67e3df2f06c96a6ccd73bda4c92f0 (patch) | |
tree | 40574d692362c2ce39fe76f11c8f03e296c6c54a /include/mtd | |
parent | 24b5ce20cc75603ce7c03a42116c30a17bce509a (diff) |
Kill jffs2-user.h
This file does not define any kernel-userspace API, all
it does it defines few helpers for userspace. Instead,
userspace should have a private copy of this file.
The main (if not the only) user is the mtd-utils package, but
it already has a private copy of this file.
This patch also removes references to 'jffs2-user.h' from
'Kbuild' and MAINTAINERS' files.
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'include/mtd')
-rw-r--r-- | include/mtd/Kbuild | 1 | ||||
-rw-r--r-- | include/mtd/jffs2-user.h | 34 |
2 files changed, 0 insertions, 35 deletions
diff --git a/include/mtd/Kbuild b/include/mtd/Kbuild index 8eb018f96002..192f8fb7d546 100644 --- a/include/mtd/Kbuild +++ b/include/mtd/Kbuild | |||
@@ -1,5 +1,4 @@ | |||
1 | header-y += inftl-user.h | 1 | header-y += inftl-user.h |
2 | header-y += jffs2-user.h | ||
3 | header-y += mtd-abi.h | 2 | header-y += mtd-abi.h |
4 | header-y += mtd-user.h | 3 | header-y += mtd-user.h |
5 | header-y += nftl-user.h | 4 | header-y += nftl-user.h |
diff --git a/include/mtd/jffs2-user.h b/include/mtd/jffs2-user.h deleted file mode 100644 index fa94b0eb67c1..000000000000 --- a/include/mtd/jffs2-user.h +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | /* | ||
2 | * JFFS2 definitions for use in user space only | ||
3 | */ | ||
4 | |||
5 | #ifndef __JFFS2_USER_H__ | ||
6 | #define __JFFS2_USER_H__ | ||
7 | |||
8 | /* This file is blessed for inclusion by userspace */ | ||
9 | #include <linux/jffs2.h> | ||
10 | #include <linux/types.h> | ||
11 | #include <endian.h> | ||
12 | #include <byteswap.h> | ||
13 | |||
14 | #undef cpu_to_je16 | ||
15 | #undef cpu_to_je32 | ||
16 | #undef cpu_to_jemode | ||
17 | #undef je16_to_cpu | ||
18 | #undef je32_to_cpu | ||
19 | #undef jemode_to_cpu | ||
20 | |||
21 | extern int target_endian; | ||
22 | |||
23 | #define t16(x) ({ __u16 __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_16(__b); }) | ||
24 | #define t32(x) ({ __u32 __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_32(__b); }) | ||
25 | |||
26 | #define cpu_to_je16(x) ((jint16_t){t16(x)}) | ||
27 | #define cpu_to_je32(x) ((jint32_t){t32(x)}) | ||
28 | #define cpu_to_jemode(x) ((jmode_t){t32(x)}) | ||
29 | |||
30 | #define je16_to_cpu(x) (t16((x).v16)) | ||
31 | #define je32_to_cpu(x) (t32((x).v32)) | ||
32 | #define jemode_to_cpu(x) (t32((x).m)) | ||
33 | |||
34 | #endif /* __JFFS2_USER_H__ */ | ||