diff options
author | Changli Gao <xiaosuo@gmail.com> | 2011-03-23 19:42:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-23 22:46:40 -0400 |
commit | cfaf346cb2741ca648d83527df173b759381e607 (patch) | |
tree | 578b3d6ce766950fb20f29839c6fbae5aad41a36 | |
parent | 115bcd156a7c4b4dad950f3bd2e4d023688c2ee7 (diff) |
drivers/char/mem.c: clean up the code
Reduce the lines of code and simplify the logic.
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/char/mem.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/char/mem.c b/drivers/char/mem.c index 1256454b2d43..436a99017998 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c | |||
@@ -47,10 +47,7 @@ static inline unsigned long size_inside_page(unsigned long start, | |||
47 | #ifndef ARCH_HAS_VALID_PHYS_ADDR_RANGE | 47 | #ifndef ARCH_HAS_VALID_PHYS_ADDR_RANGE |
48 | static inline int valid_phys_addr_range(unsigned long addr, size_t count) | 48 | static inline int valid_phys_addr_range(unsigned long addr, size_t count) |
49 | { | 49 | { |
50 | if (addr + count > __pa(high_memory)) | 50 | return addr + count <= __pa(high_memory); |
51 | return 0; | ||
52 | |||
53 | return 1; | ||
54 | } | 51 | } |
55 | 52 | ||
56 | static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t size) | 53 | static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t size) |