Skip to content

Commit 31e97d7

Browse files
aurel32torvalds
authored andcommitted
media: solo6x10: replace max(a, min(b, c)) by clamp(b, a, c)
This patch replaces max(a, min(b, c)) by clamp(b, a, c) in the solo6x10 driver. This improves the readability and more importantly, for the solo6x10-p2m.c file, this reduces on my system (x86-64, gcc 13): - the preprocessed size from 121 MiB to 4.5 MiB; - the build CPU time from 46.8 s to 1.6 s; - the build memory from 2786 MiB to 98MiB. In fine, this allows this relatively simple C file to be built on a 32-bit system. Reported-by: Jiri Slaby <jirislaby@gmail.com> Closes: https://lore.kernel.org/lkml/18c6df0d-45ed-450c-9eda-95160a2bbb8e@gmail.com/ Cc: <stable@vger.kernel.org> # v6.7+ Suggested-by: David Laight <David.Laight@ACULAB.COM> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> Reviewed-by: David Laight <David.Laight@ACULAB.COM> Reviewed-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 978ffcb commit 31e97d7

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

drivers/media/pci/solo6x10/solo6x10-offsets.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,16 @@
5757
#define SOLO_MP4E_EXT_ADDR(__solo) \
5858
(SOLO_EREF_EXT_ADDR(__solo) + SOLO_EREF_EXT_AREA(__solo))
5959
#define SOLO_MP4E_EXT_SIZE(__solo) \
60-
max((__solo->nr_chans * 0x00080000), \
61-
min(((__solo->sdram_size - SOLO_MP4E_EXT_ADDR(__solo)) - \
62-
__SOLO_JPEG_MIN_SIZE(__solo)), 0x00ff0000))
60+
clamp(__solo->sdram_size - SOLO_MP4E_EXT_ADDR(__solo) - \
61+
__SOLO_JPEG_MIN_SIZE(__solo), \
62+
__solo->nr_chans * 0x00080000, 0x00ff0000)
6363

6464
#define __SOLO_JPEG_MIN_SIZE(__solo) (__solo->nr_chans * 0x00080000)
6565
#define SOLO_JPEG_EXT_ADDR(__solo) \
6666
(SOLO_MP4E_EXT_ADDR(__solo) + SOLO_MP4E_EXT_SIZE(__solo))
6767
#define SOLO_JPEG_EXT_SIZE(__solo) \
68-
max(__SOLO_JPEG_MIN_SIZE(__solo), \
69-
min((__solo->sdram_size - SOLO_JPEG_EXT_ADDR(__solo)), 0x00ff0000))
68+
clamp(__solo->sdram_size - SOLO_JPEG_EXT_ADDR(__solo), \
69+
__SOLO_JPEG_MIN_SIZE(__solo), 0x00ff0000)
7070

7171
#define SOLO_SDRAM_END(__solo) \
7272
(SOLO_JPEG_EXT_ADDR(__solo) + SOLO_JPEG_EXT_SIZE(__solo))

0 commit comments

Comments
 (0)