[PATCH 1/2] staging: media: davinci_vpfe: Rewrite return statement in vpfe_video.c

[PATCH 1/2] staging: media: davinci_vpfe: Rewrite return statement in vpfe_video.c

[Lisa Nguyen]

Rewrite the return statement in vpfe_video.c to eliminate the
use of a ternary operator. This will prevent the checkpatch.pl
script from generating a warning saying to remove () from
this particular return statement.

Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
---
 drivers/staging/media/davinci_vpfe/vpfe_video.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c
index 24d98a6..49aafe4 100644
--- a/drivers/staging/media/davinci_vpfe/vpfe_video.c
+++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c
@@ -346,7 +346,10 @@ static int vpfe_pipeline_disable(struct vpfe_pipeline *pipe)
 	}
 	mutex_unlock(&mdev->graph_mutex);
 
-	return (ret == 0) ? ret : -ETIMEDOUT ;
+	if (ret == 0)
+		return ret;
+	else
+		return -ETIMEDOUT;
 }
 
 /*
-- 
1.8.1.2

[PATCH 2/2] staging: media: davinci_vpfe: Remove spaces before semicolons

[Lisa Nguyen]

Remove unnecessary spaces before semicolons to meet kernel
coding style.

Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
---
 drivers/staging/media/davinci_vpfe/dm365_ipipe.c    | 2 +-
 drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c | 4 ++--
 drivers/staging/media/davinci_vpfe/dm365_isif.c     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/media/davinci_vpfe/dm365_ipipe.c b/drivers/staging/media/davinci_vpfe/dm365_ipipe.c
index 766a071..b7044a3 100644
--- a/drivers/staging/media/davinci_vpfe/dm365_ipipe.c
+++ b/drivers/staging/media/davinci_vpfe/dm365_ipipe.c
@@ -1009,7 +1009,7 @@ static int ipipe_validate_yee_params(struct vpfe_ipipe_yee *yee)
 	    yee->es_ofst_grad > YEE_THR_MASK)
 		return -EINVAL;
 
-	for (i = 0; i < VPFE_IPIPE_MAX_SIZE_YEE_LUT ; i++)
+	for (i = 0; i < VPFE_IPIPE_MAX_SIZE_YEE_LUT; i++)
 		if (yee->table[i] > YEE_ENTRY_MASK)
 			return -EINVAL;
 
diff --git a/drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c b/drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c
index e027b92..2d36b60 100644
--- a/drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c
+++ b/drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c
@@ -791,7 +791,7 @@ ipipe_set_3d_lut_regs(void *__iomem base_addr, void *__iomem isp5_base_addr,
 
 	/* valied table */
 	tbl = lut_3d->table;
-	for (i = 0 ; i < VPFE_IPIPE_MAX_SIZE_3D_LUT; i++) {
+	for (i = 0; i < VPFE_IPIPE_MAX_SIZE_3D_LUT; i++) {
 		/* Each entry has 0-9 (B), 10-19 (G) and
 		20-29 R values */
 		val = tbl[i].b & D3_LUT_ENTRY_MASK;
@@ -899,7 +899,7 @@ ipipe_set_gbce_regs(void *__iomem base_addr, void *__iomem isp5_base_addr,
 	if (!gbce->table)
 		return;
 
-	for (count = 0; count < VPFE_IPIPE_MAX_SIZE_GBCE_LUT ; count += 2)
+	for (count = 0; count < VPFE_IPIPE_MAX_SIZE_GBCE_LUT; count += 2)
 		w_ip_table(isp5_base_addr, ((gbce->table[count + 1] & mask) <<
 		GBCE_ENTRY_SHIFT) | (gbce->table[count] & mask),
 		((count/2) << 2) + GBCE_TB_START_ADDR);
diff --git a/drivers/staging/media/davinci_vpfe/dm365_isif.c b/drivers/staging/media/davinci_vpfe/dm365_isif.c
index ff48fce..4171cfd 100644
--- a/drivers/staging/media/davinci_vpfe/dm365_isif.c
+++ b/drivers/staging/media/davinci_vpfe/dm365_isif.c
@@ -918,7 +918,7 @@ isif_config_dfc(struct vpfe_isif_device *isif, struct vpfe_isif_dfc *vdfc)
 		   (0 << ISIF_VDFC_EN_SHIFT), DFCCTL);
 
 	isif_write(isif->isif_cfg.base_addr, 0x6, DFCMEMCTL);
-	for (i = 0 ; i < vdfc->num_vdefects; i++) {
+	for (i = 0; i < vdfc->num_vdefects; i++) {
 		count = DFC_WRITE_WAIT_COUNT;
 		while (count &&
 			(isif_read(isif->isif_cfg.base_addr, DFCMEMCTL) & 0x2))
-- 
1.8.1.2

Re: [PATCH 1/2] staging: media: davinci_vpfe: Rewrite return statement in vpfe_video.c

[Prabhakar Lad]

Hi Lisa,

Thanks for the patch.

On Tue, Oct 29, 2013 at 2:53 AM, Lisa Nguyen <lisa@xenapiadmin.com> wrote:
> Rewrite the return statement in vpfe_video.c to eliminate the
> use of a ternary operator. This will prevent the checkpatch.pl
> script from generating a warning saying to remove () from
> this particular return statement.
>
> Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
> ---
>  drivers/staging/media/davinci_vpfe/vpfe_video.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/staging/media/davinci_vpfe/vpfe_video.c b/drivers/staging/media/davinci_vpfe/vpfe_video.c
> index 24d98a6..49aafe4 100644
> --- a/drivers/staging/media/davinci_vpfe/vpfe_video.c
> +++ b/drivers/staging/media/davinci_vpfe/vpfe_video.c
> @@ -346,7 +346,10 @@ static int vpfe_pipeline_disable(struct vpfe_pipeline *pipe)
>         }
>         mutex_unlock(&mdev->graph_mutex);
>
> -       return (ret == 0) ? ret : -ETIMEDOUT ;
> +       if (ret == 0)
> +               return ret;
> +       else
I would remove this else and align the below return statement.

> +               return -ETIMEDOUT;
>  }
>
>  /*
Regards,
--Prabhakar Lad

Re: [PATCH 2/2] staging: media: davinci_vpfe: Remove spaces before semicolons

[Prabhakar Lad]

On Tue, Oct 29, 2013 at 2:53 AM, Lisa Nguyen <lisa@xenapiadmin.com> wrote:
> Remove unnecessary spaces before semicolons to meet kernel
> coding style.
>
> Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>

Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>

Regards,
--Prabhakar Lad

Re: [PATCH 2/2] staging: media: davinci_vpfe: Remove spaces before semicolons

[Laurent Pinchart]

Hi Prabhakar,

On Wednesday 30 October 2013 13:20:25 Prabhakar Lad wrote:
> On Tue, Oct 29, 2013 at 2:53 AM, Lisa Nguyen <lisa@xenapiadmin.com> wrote:
> > Remove unnecessary spaces before semicolons to meet kernel
> > coding style.
> > 
> > Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
> 
> Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>

Do you plan to send a pull request for these two patches ?

-- 
Regards,

Laurent Pinchart

Re: [PATCH 2/2] staging: media: davinci_vpfe: Remove spaces before semicolons

[Prabhakar Lad]

Hi Laurent,

On Tue, Dec 10, 2013 at 7:34 PM, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
> Hi Prabhakar,
>
> On Wednesday 30 October 2013 13:20:25 Prabhakar Lad wrote:
>> On Tue, Oct 29, 2013 at 2:53 AM, Lisa Nguyen <lisa@xenapiadmin.com> wrote:
>> > Remove unnecessary spaces before semicolons to meet kernel
>> > coding style.
>> >
>> > Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
>>
>> Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
>
> Do you plan to send a pull request for these two patches ?
>
I had asked for a change in the first patch but Lisa never turned back :(
anyway I'll fix it and issue a pull request today to Mauro.

Thanks,
--Prabhakar Lad

Re: [PATCH 2/2] staging: media: davinci_vpfe: Remove spaces before semicolons

[Lisa Nguyen]

Hi everyone,

On Tue, Dec 10, 2013 at 6:34 AM, Prabhakar Lad
<prabhakar.csengg@gmail.com> wrote:
> Hi Laurent,
>
> On Tue, Dec 10, 2013 at 7:34 PM, Laurent Pinchart
> <laurent.pinchart@ideasonboard.com> wrote:
>> Hi Prabhakar,
>>
>> On Wednesday 30 October 2013 13:20:25 Prabhakar Lad wrote:
>>> On Tue, Oct 29, 2013 at 2:53 AM, Lisa Nguyen <lisa@xenapiadmin.com> wrote:
>>> > Remove unnecessary spaces before semicolons to meet kernel
>>> > coding style.
>>> >
>>> > Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
>>>
>>> Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
>>
>> Do you plan to send a pull request for these two patches ?
>>
> I had asked for a change in the first patch but Lisa never turned back :(
> anyway I'll fix it and issue a pull request today to Mauro.

My apologies. What happened was that I originally had sent these two
patches to the staging mailing list. Greg KH advised me to send these
to Mauro and the linux-media mailing list instead. As a result, there
was a debate about the way the return statement was written in my
first patch between Greg and a fellow developer, so I wasn't sure who
to listen to. I was in the midst of changing jobs, so this didn't take
top priority.

Again, sorry, but I thank you for considering my patches.

Lisa

Re: [PATCH 2/2] staging: media: davinci_vpfe: Remove spaces before semicolons

[Prabhakar Lad]

Hi Lisa,

On Tue, Dec 10, 2013 at 8:27 PM, Lisa Nguyen <lisa@xenapiadmin.com> wrote:
> Hi everyone,
>
> On Tue, Dec 10, 2013 at 6:34 AM, Prabhakar Lad
> <prabhakar.csengg@gmail.com> wrote:
>> Hi Laurent,
>>
>> On Tue, Dec 10, 2013 at 7:34 PM, Laurent Pinchart
>> <laurent.pinchart@ideasonboard.com> wrote:
>>> Hi Prabhakar,
>>>
>>> On Wednesday 30 October 2013 13:20:25 Prabhakar Lad wrote:
>>>> On Tue, Oct 29, 2013 at 2:53 AM, Lisa Nguyen <lisa@xenapiadmin.com> wrote:
>>>> > Remove unnecessary spaces before semicolons to meet kernel
>>>> > coding style.
>>>> >
>>>> > Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
>>>>
>>>> Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
>>>
>>> Do you plan to send a pull request for these two patches ?
>>>
>> I had asked for a change in the first patch but Lisa never turned back :(
>> anyway I'll fix it and issue a pull request today to Mauro.
>
> My apologies. What happened was that I originally had sent these two
> patches to the staging mailing list. Greg KH advised me to send these
> to Mauro and the linux-media mailing list instead. As a result, there
> was a debate about the way the return statement was written in my
> first patch between Greg and a fellow developer, so I wasn't sure who
> to listen to. I was in the midst of changing jobs, so this didn't take
> top priority.
>
Ok, do you plan to post it now ?

Regards,
--Prabhakar Lad

Re: [PATCH 2/2] staging: media: davinci_vpfe: Remove spaces before semicolons

[Lisa Nguyen]

Hi Prabhakar,

On Tue, Dec 10, 2013 at 7:04 AM, Prabhakar Lad
<prabhakar.csengg@gmail.com> wrote:
> Hi Lisa,
>
> On Tue, Dec 10, 2013 at 8:27 PM, Lisa Nguyen <lisa@xenapiadmin.com> wrote:
>> Hi everyone,
>>
>> On Tue, Dec 10, 2013 at 6:34 AM, Prabhakar Lad
>> <prabhakar.csengg@gmail.com> wrote:
>>> Hi Laurent,
>>>
>>> On Tue, Dec 10, 2013 at 7:34 PM, Laurent Pinchart
>>> <laurent.pinchart@ideasonboard.com> wrote:
>>>> Hi Prabhakar,
>>>>
>>>> On Wednesday 30 October 2013 13:20:25 Prabhakar Lad wrote:
>>>>> On Tue, Oct 29, 2013 at 2:53 AM, Lisa Nguyen <lisa@xenapiadmin.com> wrote:
>>>>> > Remove unnecessary spaces before semicolons to meet kernel
>>>>> > coding style.
>>>>> >
>>>>> > Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
>>>>>
>>>>> Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
>>>>
>>>> Do you plan to send a pull request for these two patches ?
>>>>
>>> I had asked for a change in the first patch but Lisa never turned back :(
>>> anyway I'll fix it and issue a pull request today to Mauro.
>>
>> My apologies. What happened was that I originally had sent these two
>> patches to the staging mailing list. Greg KH advised me to send these
>> to Mauro and the linux-media mailing list instead. As a result, there
>> was a debate about the way the return statement was written in my
>> first patch between Greg and a fellow developer, so I wasn't sure who
>> to listen to. I was in the midst of changing jobs, so this didn't take
>> top priority.
>>
> Ok, do you plan to post it now ?

To be clear, I'd only have to update the first patch, correct?

Re: [PATCH 2/2] staging: media: davinci_vpfe: Remove spaces before semicolons

[Prabhakar Lad]

Hi Lisa,

On Tue, Dec 10, 2013 at 8:38 PM, Lisa Nguyen <lisa@xenapiadmin.com> wrote:
> Hi Prabhakar,
>
> On Tue, Dec 10, 2013 at 7:04 AM, Prabhakar Lad
> <prabhakar.csengg@gmail.com> wrote:
>> Hi Lisa,
>>
>> On Tue, Dec 10, 2013 at 8:27 PM, Lisa Nguyen <lisa@xenapiadmin.com> wrote:
>>> Hi everyone,
>>>
>>> On Tue, Dec 10, 2013 at 6:34 AM, Prabhakar Lad
>>> <prabhakar.csengg@gmail.com> wrote:
>>>> Hi Laurent,
>>>>
>>>> On Tue, Dec 10, 2013 at 7:34 PM, Laurent Pinchart
>>>> <laurent.pinchart@ideasonboard.com> wrote:
>>>>> Hi Prabhakar,
>>>>>
>>>>> On Wednesday 30 October 2013 13:20:25 Prabhakar Lad wrote:
>>>>>> On Tue, Oct 29, 2013 at 2:53 AM, Lisa Nguyen <lisa@xenapiadmin.com> wrote:
>>>>>> > Remove unnecessary spaces before semicolons to meet kernel
>>>>>> > coding style.
>>>>>> >
>>>>>> > Signed-off-by: Lisa Nguyen <lisa@xenapiadmin.com>
>>>>>>
>>>>>> Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
>>>>>
>>>>> Do you plan to send a pull request for these two patches ?
>>>>>
>>>> I had asked for a change in the first patch but Lisa never turned back :(
>>>> anyway I'll fix it and issue a pull request today to Mauro.
>>>
>>> My apologies. What happened was that I originally had sent these two
>>> patches to the staging mailing list. Greg KH advised me to send these
>>> to Mauro and the linux-media mailing list instead. As a result, there
>>> was a debate about the way the return statement was written in my
>>> first patch between Greg and a fellow developer, so I wasn't sure who
>>> to listen to. I was in the midst of changing jobs, so this didn't take
>>> top priority.
>>>
>> Ok, do you plan to post it now ?
>
> To be clear, I'd only have to update the first patch, correct?

Yes!

Regards,
--Prabhakar Lad