aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorPaul McQuade <paulmcquad@gmail.com>2014-10-09 18:29:11 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-09 22:26:00 -0400
commitbaa2ef83981c71ceb00f68fbdac323253c2c3e42 (patch)
treeb708e0dab85ec5d5b35b969f8912cc601c4de7cc /mm
parent25acde317354997bb945892189f32ffb31b7379b (diff)
mm/dmapool.c: fixed a brace coding style issue
Remove 3 brace coding style for any arm of this statement Signed-off-by: Paul McQuade <paulmcquad@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/dmapool.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/mm/dmapool.c b/mm/dmapool.c
index 2372ed5a33d3..fd5fe4342e93 100644
--- a/mm/dmapool.c
+++ b/mm/dmapool.c
@@ -135,28 +135,25 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev,
135 size_t allocation; 135 size_t allocation;
136 bool empty = false; 136 bool empty = false;
137 137
138 if (align == 0) { 138 if (align == 0)
139 align = 1; 139 align = 1;
140 } else if (align & (align - 1)) { 140 else if (align & (align - 1))
141 return NULL; 141 return NULL;
142 }
143 142
144 if (size == 0) { 143 if (size == 0)
145 return NULL; 144 return NULL;
146 } else if (size < 4) { 145 else if (size < 4)
147 size = 4; 146 size = 4;
148 }
149 147
150 if ((size % align) != 0) 148 if ((size % align) != 0)
151 size = ALIGN(size, align); 149 size = ALIGN(size, align);
152 150
153 allocation = max_t(size_t, size, PAGE_SIZE); 151 allocation = max_t(size_t, size, PAGE_SIZE);
154 152
155 if (!boundary) { 153 if (!boundary)
156 boundary = allocation; 154 boundary = allocation;
157 } else if ((boundary < size) || (boundary & (boundary - 1))) { 155 else if ((boundary < size) || (boundary & (boundary - 1)))
158 return NULL; 156 return NULL;
159 }
160 157
161 retval = kmalloc_node(sizeof(*retval), GFP_KERNEL, dev_to_node(dev)); 158 retval = kmalloc_node(sizeof(*retval), GFP_KERNEL, dev_to_node(dev));
162 if (!retval) 159 if (!retval)