Message ID | 20211104061709.1505592-1-yang.guang5@zte.com.cn (mailing list archive) |
---|---|
State | Superseded |
Headers | show |
Series | powerpc: use swap() to make code cleaner | expand |
Hi, On Thu, 4 Nov 2021 14:17:09 +0800 davidcomponentone@gmail.com wrote: > > From: Yang Guang <yang.guang5@zte.com.cn> > > Use the macro 'swap()' defined in 'include/linux/minmax.h' to avoid > opencoding it. So if swap() is in the above include file, then you should include it.
On Thu, Nov 04, 2021 at 09:06:56PM +1100, Stephen Rothwell wrote: > On Thu, 4 Nov 2021 14:17:09 +0800 davidcomponentone@gmail.com wrote: > > From: Yang Guang <yang.guang5@zte.com.cn> > > > > Use the macro 'swap()' defined in 'include/linux/minmax.h' to avoid > > opencoding it. > > So if swap() is in the above include file, then you should include it. It is included from kernel.h already (which is included from delay.h). Segher
Hi Segher, On Thu, 4 Nov 2021 06:33:51 -0500 Segher Boessenkool <segher@kernel.crashing.org> wrote: > > On Thu, Nov 04, 2021 at 09:06:56PM +1100, Stephen Rothwell wrote: > > On Thu, 4 Nov 2021 14:17:09 +0800 davidcomponentone@gmail.com wrote: > > > From: Yang Guang <yang.guang5@zte.com.cn> > > > > > > Use the macro 'swap()' defined in 'include/linux/minmax.h' to avoid > > > opencoding it. > > > > So if swap() is in the above include file, then you should include it. > > It is included from kernel.h already (which is included from delay.h). And that becomes a pain when include files get "cleaned up". :-( $ grep kernel.h include/linux/delay.h $ See commit 300424acf349 ("include/linux/delay.h: replace kernel.h with the necessary inclusions") currently pending the Andrew Morton's patch queue (the above is a linux-next commit).
diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c index b7ceb041743c..5b40e2d46090 100644 --- a/arch/powerpc/kernel/fadump.c +++ b/arch/powerpc/kernel/fadump.c @@ -1265,7 +1265,6 @@ static void fadump_release_reserved_area(u64 start, u64 end) static void sort_and_merge_mem_ranges(struct fadump_mrange_info *mrange_info) { struct fadump_memory_range *mem_ranges; - struct fadump_memory_range tmp_range; u64 base, size; int i, j, idx; @@ -1281,9 +1280,7 @@ static void sort_and_merge_mem_ranges(struct fadump_mrange_info *mrange_info) idx = j; } if (idx != i) { - tmp_range = mem_ranges[idx]; - mem_ranges[idx] = mem_ranges[i]; - mem_ranges[i] = tmp_range; + swap(mem_ranges[idx], mem_ranges[i]); } }