[PATCH] media: s5p-mfc Fix misspelled error message and checkpatch errors

[PATCH] media: s5p-mfc Fix misspelled error message and checkpatch errors

[Shuah Khan]

Fix misspelled error message and existing checkpatch errors in the
error message conditional.

WARNING: suspect code indent for conditional statements (8, 24)
 	if (ctx->state != MFCINST_HEAD_PARSED &&
[...]
+               mfc_err("Can not get crop information\n");

Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
---
 drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
index a01a373..06061c4 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
@@ -775,11 +775,11 @@ static int vidioc_g_crop(struct file *file, void *priv,
 	u32 left, right, top, bottom;
 
 	if (ctx->state != MFCINST_HEAD_PARSED &&
-	ctx->state != MFCINST_RUNNING && ctx->state != MFCINST_FINISHING
-					&& ctx->state != MFCINST_FINISHED) {
-			mfc_err("Cannont set crop\n");
-			return -EINVAL;
-		}
+	    ctx->state != MFCINST_RUNNING && ctx->state != MFCINST_FINISHING
+	    && ctx->state != MFCINST_FINISHED) {
+		mfc_err("Can not get crop information\n");
+		return -EINVAL;
+	}
 	if (ctx->src_fmt->fourcc == V4L2_PIX_FMT_H264) {
 		left = s5p_mfc_hw_call(dev->mfc_ops, get_crop_info_h, ctx);
 		right = left >> S5P_FIMV_SHARED_CROP_RIGHT_SHIFT;
-- 
2.7.4

[PATCH] media: s5p-mfc Fix misspelled error message and checkpatch errors

[Joe Perches]

On Mon, 2016-07-11 at 16:39 -0600, Shuah Khan wrote:
> Fix misspelled error message and existing checkpatch errors in the
> error message conditional.
[]
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
[]
> @@ -775,11 +775,11 @@ static int vidioc_g_crop(struct file *file, void *priv,
> ?	u32 left, right, top, bottom;
> ?
> ?	if (ctx->state != MFCINST_HEAD_PARSED &&
> -	ctx->state != MFCINST_RUNNING && ctx->state != MFCINST_FINISHING
> -					&& ctx->state != MFCINST_FINISHED) {
> -			mfc_err("Cannont set crop\n");
> -			return -EINVAL;
> -		}
> +	????ctx->state != MFCINST_RUNNING && ctx->state != MFCINST_FINISHING
> +	????&& ctx->state != MFCINST_FINISHED) {
> +		mfc_err("Can not get crop information\n");
> +		return -EINVAL;
> +	}

is it a set or a get?

It'd be nicer for humans to read if the alignment was consistent

	if (ctx->state !=?MFCINST_HEAD_PARSED &&
	? ? ctx->state !=?MFCINST_RUNNING &&
	? ? ctx->state !=?MFCINST_FINISHING &&
	? ? ctx->state !=?MFCINST_FINISHED) {
		mfc_err("Can not get crop information\n");
		return -EINVAL;
	}

[PATCH] media: s5p-mfc Fix misspelled error message and checkpatch errors

[Shuah Khan]

On 07/12/2016 08:06 AM, Joe Perches wrote:
> On Mon, 2016-07-11 at 16:39 -0600, Shuah Khan wrote:
>> Fix misspelled error message and existing checkpatch errors in the
>> error message conditional.
> []
>> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
> []
>> @@ -775,11 +775,11 @@ static int vidioc_g_crop(struct file *file, void *priv,
>>  	u32 left, right, top, bottom;
>>  
>>  	if (ctx->state != MFCINST_HEAD_PARSED &&
>> -	ctx->state != MFCINST_RUNNING && ctx->state != MFCINST_FINISHING
>> -					&& ctx->state != MFCINST_FINISHED) {
>> -			mfc_err("Cannont set crop\n");
>> -			return -EINVAL;
>> -		}
>> +	    ctx->state != MFCINST_RUNNING && ctx->state != MFCINST_FINISHING
>> +	    && ctx->state != MFCINST_FINISHED) {
>> +		mfc_err("Can not get crop information\n");
>> +		return -EINVAL;
>> +	}
> 
> is it a set or a get?

vidioc_g_crop is a get routine.

> 
> It'd be nicer for humans to read if the alignment was consistent

Are you okay with this alignment change or would you like it
changed? checkpatch stopped complaining with the code as follows:

> 
> 	if (ctx->state != MFCINST_HEAD_PARSED &&
> 	    ctx->state != MFCINST_RUNNING &&
> 	    ctx->state != MFCINST_FINISHING &&
> 	    ctx->state != MFCINST_FINISHED) {
> 		mfc_err("Can not get crop information\n");
> 		return -EINVAL;
> 	}
> 
> 

thanks,
-- Shuah

[PATCH] media: s5p-mfc Fix misspelled error message and checkpatch errors

[Javier Martinez Canillas]

Hello Shuah,

On 07/11/2016 06:39 PM, Shuah Khan wrote:
> Fix misspelled error message and existing checkpatch errors in the
> error message conditional.
> 
> WARNING: suspect code indent for conditional statements (8, 24)
>  	if (ctx->state != MFCINST_HEAD_PARSED &&
> [...]
> +               mfc_err("Can not get crop information\n");
> 
> Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
> ---

Patch looks good to me. Maybe is better to split the message and checkpatch
changes in two different patches. But I don't have a strong opinion on this:

Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>

Best regards,
-- 
Javier Martinez Canillas
Open Source Group
Samsung Research America

[PATCH] media: s5p-mfc Fix misspelled error message and checkpatch errors

[Shuah Khan]

On 07/12/2016 09:03 AM, Javier Martinez Canillas wrote:
> Hello Shuah,
> 
> On 07/11/2016 06:39 PM, Shuah Khan wrote:
>> Fix misspelled error message and existing checkpatch errors in the
>> error message conditional.
>>
>> WARNING: suspect code indent for conditional statements (8, 24)
>>  	if (ctx->state != MFCINST_HEAD_PARSED &&
>> [...]
>> +               mfc_err("Can not get crop information\n");
>>
>> Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
>> ---
> 
> Patch looks good to me. Maybe is better to split the message and checkpatch
> changes in two different patches. But I don't have a strong opinion on this:
> 
> Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
> 

Thanks for the review. I considered splitting them, however the patch
that fixes the message will be flagged by checkpatch. It does make
sense to split the changes into two patches. What I could do is, make
the checkpatch fixes the first patch and fix the error message in the
second one.

How does that sound?

-- Shuah

[PATCH] media: s5p-mfc Fix misspelled error message and checkpatch errors

[Javier Martinez Canillas]

Hello Shuah,

On 07/12/2016 11:07 AM, Shuah Khan wrote:
> On 07/12/2016 09:03 AM, Javier Martinez Canillas wrote:
>> Hello Shuah,
>>
>> On 07/11/2016 06:39 PM, Shuah Khan wrote:
>>> Fix misspelled error message and existing checkpatch errors in the
>>> error message conditional.
>>>
>>> WARNING: suspect code indent for conditional statements (8, 24)
>>>  	if (ctx->state != MFCINST_HEAD_PARSED &&
>>> [...]
>>> +               mfc_err("Can not get crop information\n");
>>>
>>> Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
>>> ---
>>
>> Patch looks good to me. Maybe is better to split the message and checkpatch
>> changes in two different patches. But I don't have a strong opinion on this:
>>
>> Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
>>
> 
> Thanks for the review. I considered splitting them, however the patch
> that fixes the message will be flagged by checkpatch. It does make
> sense to split the changes into two patches. What I could do is, make
> the checkpatch fixes the first patch and fix the error message in the
> second one.
> 
> How does that sound?
>

Sounds good to me.
 
> -- Shuah
> 
> 

Best regards,
-- 
Javier Martinez Canillas
Open Source Group
Samsung Research America

[PATCH] media: s5p-mfc Fix misspelled error message and checkpatch errors

[Joe Perches]

On Tue, 2016-07-12 at 08:42 -0600, Shuah Khan wrote:
> On 07/12/2016 08:06 AM, Joe Perches wrote:
> > On Mon, 2016-07-11 at 16:39 -0600, Shuah Khan wrote:
> > > Fix misspelled error message and existing checkpatch errors in the
> > > error message conditional.
> > []
> > > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
> > []
> > > @@ -775,11 +775,11 @@ static int vidioc_g_crop(struct file *file, void *priv,
> > > ?	u32 left, right, top, bottom;
> > > ?
> > > ?	if (ctx->state != MFCINST_HEAD_PARSED &&
> > > -	ctx->state != MFCINST_RUNNING && ctx->state != MFCINST_FINISHING
> > > -					&& ctx->state != MFCINST_FINISHED) {
> > > -			mfc_err("Cannont set crop\n");
> > > -			return -EINVAL;
> > > -		}
> > > +	????ctx->state != MFCINST_RUNNING && ctx->state != MFCINST_FINISHING
> > > +	????&& ctx->state != MFCINST_FINISHED) {
> > > +		mfc_err("Can not get crop information\n");
> > > +		return -EINVAL;
> > > +	}
> > is it a set or a get?
> vidioc_g_crop is a get routine.
> > 
> > It'd be nicer for humans to read if the alignment was consistent
> Are you okay with this alignment change or would you like it
> changed?

Well, if you're resubmitting, I'd prefer it changed.
Thanks.

[PATCH] media: s5p-mfc Fix misspelled error message and checkpatch errors

[Shuah Khan]

On 07/12/2016 09:51 AM, Joe Perches wrote:
> On Tue, 2016-07-12 at 08:42 -0600, Shuah Khan wrote:
>> On 07/12/2016 08:06 AM, Joe Perches wrote:
>>> On Mon, 2016-07-11 at 16:39 -0600, Shuah Khan wrote:
>>>> Fix misspelled error message and existing checkpatch errors in the
>>>> error message conditional.
>>> []
>>>> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
>>> []
>>>> @@ -775,11 +775,11 @@ static int vidioc_g_crop(struct file *file, void *priv,
>>>>  	u32 left, right, top, bottom;
>>>>  
>>>>  	if (ctx->state != MFCINST_HEAD_PARSED &&
>>>> -	ctx->state != MFCINST_RUNNING && ctx->state != MFCINST_FINISHING
>>>> -					&& ctx->state != MFCINST_FINISHED) {
>>>> -			mfc_err("Cannont set crop\n");
>>>> -			return -EINVAL;
>>>> -		}
>>>> +	    ctx->state != MFCINST_RUNNING && ctx->state != MFCINST_FINISHING
>>>> +	    && ctx->state != MFCINST_FINISHED) {
>>>> +		mfc_err("Can not get crop information\n");
>>>> +		return -EINVAL;
>>>> +	}
>>> is it a set or a get?
>> vidioc_g_crop is a get routine.
>>>
>>> It'd be nicer for humans to read if the alignment was consistent
>> Are you okay with this alignment change or would you like it
>> changed?
> 
> Well, if you're resubmitting, I'd prefer it changed.
> Thanks.
> 

chekcpatch stopped complaining. Are you looking for the entire file
alignments changed? I am not clear on what needs to be changed?

thanks,
-- Shuah

[PATCH] media: s5p-mfc Fix misspelled error message and checkpatch errors

[Joe Perches]

On Tue, 2016-07-12 at 10:08 -0600, Shuah Khan wrote:
> On 07/12/2016 09:51 AM, Joe Perches wrote:
> > On Tue, 2016-07-12 at 08:42 -0600, Shuah Khan wrote:
> > > On 07/12/2016 08:06 AM, Joe Perches wrote:
> > > > On Mon, 2016-07-11 at 16:39 -0600, Shuah Khan wrote:
> > > > > 
> > > > > Fix misspelled error message and existing checkpatch errors in the
> > > > > error message conditional.
> > > > []
> > > > > 
> > > > > diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
> > > > []
> > > > > 
> > > > > @@ -775,11 +775,11 @@ static int vidioc_g_crop(struct file *file, void *priv,
> > > > > ?	u32 left, right, top, bottom;
> > > > > ?
> > > > > ?	if (ctx->state != MFCINST_HEAD_PARSED &&
> > > > > -	ctx->state != MFCINST_RUNNING && ctx->state != MFCINST_FINISHING
> > > > > -					&& ctx->state != MFCINST_FINISHED) {
> > > > > -			mfc_err("Cannont set crop\n");
> > > > > -			return -EINVAL;
> > > > > -		}
> > > > > +	????ctx->state != MFCINST_RUNNING && ctx->state != MFCINST_FINISHING
> > > > > +	????&& ctx->state != MFCINST_FINISHED) {
> > > > > +		mfc_err("Can not get crop information\n");
> > > > > +		return -EINVAL;
> > > > > +	}
> > > > is it a set or a get?
> > > vidioc_g_crop is a get routine.
> > > > 
> > > > 
> > > > It'd be nicer for humans to read if the alignment was consistent
> > > Are you okay with this alignment change or would you like it
> > > changed?
> > Well, if you're resubmitting, I'd prefer it changed.
> > Thanks.
> > 
> chekcpatch stopped complaining. Are you looking for the entire file
> alignments changed? I am not clear on what needs to be changed?

I think doing just this spelling and get/set correction and
fixing the alignment in this single case in a single patch
would be fine here.

Foxing the alignment for the entire file would be a more
significant change and isn't necessary in this patch.

Another thing possible for the file would be to change the
mfc_debug and mfc_err/mfc_info macros to use pr_<level>
without the generally unnecessary __func__ and __LINE__
uses.

This could both enable dynamic_debug uses for the KERN_DEBUG
cases and reduce overall object size.