In message: [linux-yocto] imx8m: vpu: Fix the wrong positions of #endif in hantroenc_ioctl32() on 21/04/2023 Kevin Hao wrote:
> From: Kevin Hao <[email protected]> > > The commit e0585ce25814c ("MA-20005-12 hantro_vc8000e: Fix build error > exposed by -Wunused-variable") was supposed to wrapper the > hantroenc_ioctl32() with #ifdef and #endif. But it improperly put > the #endif in the middle of hantroenc_ioctl32(), and then cause weird > build errors. Fix them by moving the #endif out of the > hantroenc_ioctl32(). > > Signed-off-by: Kevin Hao <[email protected]> > --- > Hi Bruce, > > Please help me merge this into the following two branches: > v6.1/standard/nxp-sdk-6.1/nxp-soc > v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc (if exist) Thanks for the fix, this is now merged. Bruce > > drivers/mxc/hantro_vc8000e/hx280enc_vc8000e.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mxc/hantro_vc8000e/hx280enc_vc8000e.c > b/drivers/mxc/hantro_vc8000e/hx280enc_vc8000e.c > index 25adb41457fb..37a955978c58 100644 > --- a/drivers/mxc/hantro_vc8000e/hx280enc_vc8000e.c > +++ b/drivers/mxc/hantro_vc8000e/hx280enc_vc8000e.c > @@ -703,7 +703,6 @@ static long hantroenc_ioctl32(struct file *filp, unsigned > int cmd, unsigned long > if (err) \ > return err; \ > } > -#endif > > union { > unsigned long kux; > @@ -793,6 +792,7 @@ union { > } > return 0; > } > +#endif > > /* VFS methods */ > static struct file_operations hantroenc_fops = { > -- > 2.39.2 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12413): https://lists.yoctoproject.org/g/linux-yocto/message/12413 Mute This Topic: https://lists.yoctoproject.org/mt/98402510/21656 Mute #endif:https://lists.yoctoproject.org/g/linux-yocto/mutehashtag/endif Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/leave/6687884/21656/624485779/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
