Subject: [PATCH v2] staging: media: meson: vdec: declare u32 as static const appropriately

[Hans Verkuil]

On 13/04/2021 13:09, Mitali Borkar wrote:
> On Tue, Apr 13, 2021 at 09:26:01AM +0200, Hans Verkuil wrote:
>> On 13/04/2021 08:27, Mitali Borkar wrote:
>>> Declared 32 bit unsigned int as static constant inside a function
>>> appropriately.
>>>
>>> Reported-by: kernel test robot <lkp at intel.com>
>>> Signed-off-by: Mitali Borkar <mitaliborkar810 at gmail.com>
>>> ---
>>>
>>> Changes from v1:- Rectified the mistake by declaring u32 as static const
>>> properly.
>>>
>>>  drivers/staging/media/meson/vdec/codec_h264.c | 4 ++--
>>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/staging/media/meson/vdec/codec_h264.c b/drivers/staging/media/meson/vdec/codec_h264.c
>>> index ea86e9e1c447..80141b89a9f6 100644
>>> --- a/drivers/staging/media/meson/vdec/codec_h264.c
>>> +++ b/drivers/staging/media/meson/vdec/codec_h264.c
>>> @@ -287,8 +287,8 @@ static void codec_h264_resume(struct amvdec_session *sess)
>>>  	struct amvdec_core *core = sess->core;
>>>  	struct codec_h264 *h264 = sess->priv;
>>>  	u32 mb_width, mb_height, mb_total;
>>> -	static const u32[] canvas3 = { ANCO_CANVAS_ADDR, 0 };
>>> -	static const u32[] canvas4 = { 24, 0 };
>>> +	static const u32 canvas3[] = { ANCO_CANVAS_ADDR, 0 };
>>> +	static const u32 canvas4[] = { 24, 0 };
>>
>> This is a patch on top of your previous (v1) patch. That won't work
>> since the v1 is not merged, you need to make a patch against the current
>> mainline code.
>>
> But Sir, since I have made changes in the code, and committed them, now,
> if I open that file, it will contain those changes. Then should I
> rewrite the patch body more accurately? 

You only committed the v1 change in your own repository, it's not in the
upstream repository. And the patches you post must be against the upstream
repository, not your own.

'git rebase -i' can be your friend here, it makes it easy to fold the
second patch into the first, and then you only have to post the final
version.

Regards,

	Hans

> 
>> Regards,
>>
>> 	Hans
>>
>>>  
>>>  	amvdec_set_canvases(sess, canvas3, canvas4);
>>>  
>>>
>>