From c3c4efe7b0518950805a3a01d7fd09067c786ef0 Mon Sep 17 00:00:00 2001 From: Ksawlii <ksawery.blaszczak@proton.me> Date: Sun, 24 Nov 2024 00:23:52 +0100 Subject: [PATCH] Revert "media: solo6x10: replace max(a, min(b, c)) by clamp(b, a, c)" This reverts commit 0e0829bf72a8015824815a1e07cdcf4ea1f1b0d4. --- drivers/media/pci/solo6x10/solo6x10-offsets.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/media/pci/solo6x10/solo6x10-offsets.h b/drivers/media/pci/solo6x10/solo6x10-offsets.h index fdbb817e6..f414ee131 100755 --- a/drivers/media/pci/solo6x10/solo6x10-offsets.h +++ b/drivers/media/pci/solo6x10/solo6x10-offsets.h @@ -57,16 +57,16 @@ #define SOLO_MP4E_EXT_ADDR(__solo) \ (SOLO_EREF_EXT_ADDR(__solo) + SOLO_EREF_EXT_AREA(__solo)) #define SOLO_MP4E_EXT_SIZE(__solo) \ - clamp(__solo->sdram_size - SOLO_MP4E_EXT_ADDR(__solo) - \ - __SOLO_JPEG_MIN_SIZE(__solo), \ - __solo->nr_chans * 0x00080000, 0x00ff0000) + max((__solo->nr_chans * 0x00080000), \ + min(((__solo->sdram_size - SOLO_MP4E_EXT_ADDR(__solo)) - \ + __SOLO_JPEG_MIN_SIZE(__solo)), 0x00ff0000)) #define __SOLO_JPEG_MIN_SIZE(__solo) (__solo->nr_chans * 0x00080000) #define SOLO_JPEG_EXT_ADDR(__solo) \ (SOLO_MP4E_EXT_ADDR(__solo) + SOLO_MP4E_EXT_SIZE(__solo)) #define SOLO_JPEG_EXT_SIZE(__solo) \ - clamp(__solo->sdram_size - SOLO_JPEG_EXT_ADDR(__solo), \ - __SOLO_JPEG_MIN_SIZE(__solo), 0x00ff0000) + max(__SOLO_JPEG_MIN_SIZE(__solo), \ + min((__solo->sdram_size - SOLO_JPEG_EXT_ADDR(__solo)), 0x00ff0000)) #define SOLO_SDRAM_END(__solo) \ (SOLO_JPEG_EXT_ADDR(__solo) + SOLO_JPEG_EXT_SIZE(__solo))