In message: [linux-yocto] media: img: vxd: Drop the unneeded umin() function on 10/04/2024 Kevin Hao wrote:
> From: Kevin Hao <[email protected]> > > The stable commit 8d8be62a7d53 ("minmax: add umin(a, b) and umax(a, b)") > introduced an umin() macro. This conflicts with the umin() inline > function in vxe-vxd driver. So drop this inline function to fix the > build error. > > Signed-off-by: Kevin Hao <[email protected]> > --- > Hi Bruce, > > Could you help me merge this into the following two branches? > v6.1/standard/ti-sdk-6.1/ti-j7xxx > v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx merged. Bruce > > .../platform/img/vxe-vxd/decoder/h264_secure_parser.c | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/drivers/media/platform/img/vxe-vxd/decoder/h264_secure_parser.c > b/drivers/media/platform/img/vxe-vxd/decoder/h264_secure_parser.c > index 6c098a6fddf4..da43bf6a7a03 100644 > --- a/drivers/media/platform/img/vxe-vxd/decoder/h264_secure_parser.c > +++ b/drivers/media/platform/img/vxe-vxd/decoder/h264_secure_parser.c > @@ -168,14 +168,6 @@ static const int bspp_subheightc[] = { -1, 2, 1, 1 }; > */ > static const int bspp_subwidthc[] = { -1, 2, 2, 1 }; > > -/* > - * inline functions for Minimum and Maximum value > - */ > -static inline unsigned int umin(unsigned int a, unsigned int b) > -{ > - return (((a) < (b)) ? (a) : (b)); > -} > - > static inline int smin(int a, int b) > { > return (((a) < (b)) ? (a) : (b)); > -- > 2.44.0 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13787): https://lists.yoctoproject.org/g/linux-yocto/message/13787 Mute This Topic: https://lists.yoctoproject.org/mt/105437816/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
