* [PATCH v2] staging: media: davinci_vpfe: Rewrite return statement in vpfe_video.c @ 2013-12-10 16:05 Lisa Nguyen 2013-12-10 16:50 ` Laurent Pinchart 0 siblings, 1 reply; 4+ messages in thread From: Lisa Nguyen @ 2013-12-10 16:05 UTC (permalink / raw) To: prabhakar.csengg Cc: davinci-linux-open-source, linux-media, m.chehab, laurent.pinchart 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> --- Changes since v2: - Aligned -ETIMEDOUT return statement with if condition 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..22e31d2 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; + + return -ETIMEDOUT; } /* -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] staging: media: davinci_vpfe: Rewrite return statement in vpfe_video.c 2013-12-10 16:05 [PATCH v2] staging: media: davinci_vpfe: Rewrite return statement in vpfe_video.c Lisa Nguyen @ 2013-12-10 16:50 ` Laurent Pinchart 2013-12-10 17:57 ` Lisa Nguyen 0 siblings, 1 reply; 4+ messages in thread From: Laurent Pinchart @ 2013-12-10 16:50 UTC (permalink / raw) To: Lisa Nguyen Cc: prabhakar.csengg, davinci-linux-open-source, linux-media, m.chehab Hi Lisa, Thank you for the patch. On Tuesday 10 December 2013 08:05:42 Lisa Nguyen 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> > --- > Changes since v2: > - Aligned -ETIMEDOUT return statement with if condition > > 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..22e31d2 > 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; > + > + return -ETIMEDOUT; I don't want to point the obvious, but what about just return ret ? -ETIMEDOUT : 0; or, if this is just about fixing the checkpatch.pl warning, return ret == 0 ? ret : -ETIMEDOUT; (I'd prefer the first) > } > > /* -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] staging: media: davinci_vpfe: Rewrite return statement in vpfe_video.c 2013-12-10 16:50 ` Laurent Pinchart @ 2013-12-10 17:57 ` Lisa Nguyen 2013-12-11 3:04 ` Prabhakar Lad 0 siblings, 1 reply; 4+ messages in thread From: Lisa Nguyen @ 2013-12-10 17:57 UTC (permalink / raw) To: Laurent Pinchart; +Cc: Prabhakar Lad, dlos, linux-media, Mauro Carvalho Chehab Hi Laurent, On Tue, Dec 10, 2013 at 8:50 AM, Laurent Pinchart <laurent.pinchart@ideasonboard.com> wrote: > Hi Lisa, > > Thank you for the patch. > > On Tuesday 10 December 2013 08:05:42 Lisa Nguyen 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> >> --- >> Changes since v2: >> - Aligned -ETIMEDOUT return statement with if condition >> >> 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..22e31d2 >> 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; >> + >> + return -ETIMEDOUT; > > I don't want to point the obvious, but what about just > > return ret ? -ETIMEDOUT : 0; > > or, if this is just about fixing the checkpatch.pl warning, > > return ret == 0 ? ret : -ETIMEDOUT; > > (I'd prefer the first) I understand your point :) I was making changes based on Prabhakar's feedback he gave me a while back[1]. Should I wait until he says? Lisa [1] http://www.mail-archive.com/linux-media@vger.kernel.org/msg67833.html ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] staging: media: davinci_vpfe: Rewrite return statement in vpfe_video.c 2013-12-10 17:57 ` Lisa Nguyen @ 2013-12-11 3:04 ` Prabhakar Lad 0 siblings, 0 replies; 4+ messages in thread From: Prabhakar Lad @ 2013-12-11 3:04 UTC (permalink / raw) To: Lisa Nguyen; +Cc: Laurent Pinchart, dlos, linux-media, Mauro Carvalho Chehab Hi Lisa, On Tue, Dec 10, 2013 at 11:27 PM, Lisa Nguyen <lisa@xenapiadmin.com> wrote: > Hi Laurent, > > On Tue, Dec 10, 2013 at 8:50 AM, Laurent Pinchart > <laurent.pinchart@ideasonboard.com> wrote: >> Hi Lisa, >> >> Thank you for the patch. >> >> On Tuesday 10 December 2013 08:05:42 Lisa Nguyen 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> >>> --- >>> Changes since v2: >>> - Aligned -ETIMEDOUT return statement with if condition >>> >>> 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..22e31d2 >>> 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; >>> + >>> + return -ETIMEDOUT; >> >> I don't want to point the obvious, but what about just >> >> return ret ? -ETIMEDOUT : 0; >> >> or, if this is just about fixing the checkpatch.pl warning, >> >> return ret == 0 ? ret : -ETIMEDOUT; >> >> (I'd prefer the first) > > I understand your point :) I was making changes based on Prabhakar's > feedback he gave me a while back[1]. > Please go ahead as per Laurent's suggestion. Thanks, --Prabhakar Lad ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-12-11 3:04 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-12-10 16:05 [PATCH v2] staging: media: davinci_vpfe: Rewrite return statement in vpfe_video.c Lisa Nguyen 2013-12-10 16:50 ` Laurent Pinchart 2013-12-10 17:57 ` Lisa Nguyen 2013-12-11 3:04 ` Prabhakar Lad
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox