Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1585543 > unrolled thread
| Started by | Arushi Singhal <arushisinghal19971997@gmail.com> |
|---|---|
| First post | 2017-02-21 18:20 +0100 |
| Last post | 2017-02-22 05:40 +0100 |
| Articles | 4 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH] staging: xgifb: correct the multiple line dereference to fix coding stye errors Arushi Singhal <arushisinghal19971997@gmail.com> - 2017-02-21 18:20 +0100
Re: [Outreachy kernel] [PATCH] staging: xgifb: correct the multiple line dereference to fix coding stye errors Julia Lawall <julia.lawall@lip6.fr> - 2017-02-21 18:50 +0100
Re: [Outreachy kernel] [PATCH] staging: xgifb: correct the multiple line dereference to fix coding stye errors Joe Perches <joe@perches.com> - 2017-02-21 19:50 +0100
Re: [Outreachy kernel] [PATCH] staging: xgifb: correct the multiple line dereference to fix coding stye errors Joe Perches <joe@perches.com> - 2017-02-22 05:40 +0100
| From | Arushi Singhal <arushisinghal19971997@gmail.com> |
|---|---|
| Date | 2017-02-21 18:20 +0100 |
| Subject | [PATCH] staging: xgifb: correct the multiple line dereference to fix coding stye errors |
| Message-ID | <tdmgy-5z4-31@gated-at.bofh.it> |
Error was reported by checkpatch.pl as
WARNING: Avoid multiple line dereference...
if there is boolean operator then it is fixed by Splitting line at
boolean operator.
Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
---
drivers/staging/xgifb/XGI_main_26.c | 15 +++++----------
drivers/staging/xgifb/vb_setmode.c | 19 +++++++------------
2 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index 6930f7eb741b..4fd9bfafccc5 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -880,28 +880,23 @@ static void XGIfb_post_setmode(struct xgifb_video_info *xgifb_info)
if ((filter >= 0) && (filter <= 7)) {
pr_debug("FilterTable[%d]-%d: %*ph\n",
filter_tb, filter,
- 4, XGI_TV_filter[filter_tb].
- filter[filter]);
+ 4, XGI_TV_filter[filter_tb].filter[filter]);
xgifb_reg_set(
XGIPART2,
0x35,
- (XGI_TV_filter[filter_tb].
- filter[filter][0]));
+ (XGI_TV_filter[filter_tb].filter[filter][0]));
xgifb_reg_set(
XGIPART2,
0x36,
- (XGI_TV_filter[filter_tb].
- filter[filter][1]));
+ (XGI_TV_filter[filter_tb].filter[filter][1]));
xgifb_reg_set(
XGIPART2,
0x37,
- (XGI_TV_filter[filter_tb].
- filter[filter][2]));
+ (XGI_TV_filter[filter_tb].filter[filter][2]));
xgifb_reg_set(
XGIPART2,
0x38,
- (XGI_TV_filter[filter_tb].
- filter[filter][3]));
+ (XGI_TV_filter[filter_tb].filter[filter][3]));
}
}
}
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index 7c7c8c8f1df3..00f1ae3adcda 100644
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -221,8 +221,7 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex,
for (; XGI330_RefIndex[RefreshRateTableIndex + (*i)].ModeID ==
tempbx; (*i)--) {
- infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)].
- Ext_InfoFlag;
+ infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)].Ext_InfoFlag;
if (infoflag & tempax)
return 1;
@@ -231,8 +230,7 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex,
}
for ((*i) = 0;; (*i)++) {
- infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)].
- Ext_InfoFlag;
+ infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)].Ext_InfoFlag;
if (XGI330_RefIndex[RefreshRateTableIndex + (*i)].ModeID
!= tempbx) {
return 0;
@@ -654,8 +652,8 @@ static void XGI_UpdateXG21CRTC(unsigned short ModeNo,
(XGI330_RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC ==
RES640x480x60))
index = 12;
- else if (ModeNo == 0x2E && (XGI330_RefIndex[RefreshRateTableIndex].
- Ext_CRT1CRTC == RES640x480x72))
+ else if (ModeNo == 0x2E && (XGI330_RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC ==
+ RES640x480x72))
index = 13;
else if (ModeNo == 0x2F)
index = 14;
@@ -5092,8 +5090,7 @@ unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE,
i = 0;
do {
- if (XGI330_RefIndex[RefreshRateTableIndex + i].
- ModeID != ModeNo)
+ if (XGI330_RefIndex[RefreshRateTableIndex + i].ModeID != ModeNo)
break;
temp = XGI330_RefIndex[RefreshRateTableIndex + i].Ext_InfoFlag;
temp &= ModeTypeMask;
@@ -5105,8 +5102,7 @@ unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE,
} while (index != 0xFFFF);
if (!(pVBInfo->VBInfo & SetCRT2ToRAMDAC)) {
if (pVBInfo->VBInfo & SetInSlaveMode) {
- temp = XGI330_RefIndex[RefreshRateTableIndex + i - 1].
- Ext_InfoFlag;
+ temp = XGI330_RefIndex[RefreshRateTableIndex + i - 1].Ext_InfoFlag;
if (temp & InterlaceMode)
i++;
}
@@ -5483,8 +5479,7 @@ unsigned char XGISetModeNew(struct xgifb_video_info *xgifb_info,
ModeIdIndex))
return 0;
- pVBInfo->ModeType = XGI330_EModeIDTable[ModeIdIndex].
- Ext_ModeFlag & ModeTypeMask;
+ pVBInfo->ModeType = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag & ModeTypeMask;
pVBInfo->SetFlag = 0;
pVBInfo->VBInfo = DisableCRT2Display;
--
2.11.0
[toc] | [next] | [standalone]
| From | Julia Lawall <julia.lawall@lip6.fr> |
|---|---|
| Date | 2017-02-21 18:50 +0100 |
| Subject | Re: [Outreachy kernel] [PATCH] staging: xgifb: correct the multiple line dereference to fix coding stye errors |
| Message-ID | <tdmJA-5Ph-1@gated-at.bofh.it> |
| In reply to | #1585543 |
On Tue, 21 Feb 2017, Arushi Singhal wrote:
> Error was reported by checkpatch.pl as
> WARNING: Avoid multiple line dereference...
> if there is boolean operator then it is fixed by Splitting line at
> boolean operator.
This is massively execeeding the 80 character boundary, and not for
something trivial like a string. Maybe the code can be reorganized in
some other way.
julia
>
> Signed-off-by: Arushi Singhal <arushisinghal19971997@gmail.com>
> ---
> drivers/staging/xgifb/XGI_main_26.c | 15 +++++----------
> drivers/staging/xgifb/vb_setmode.c | 19 +++++++------------
> 2 files changed, 12 insertions(+), 22 deletions(-)
>
> diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
> index 6930f7eb741b..4fd9bfafccc5 100644
> --- a/drivers/staging/xgifb/XGI_main_26.c
> +++ b/drivers/staging/xgifb/XGI_main_26.c
> @@ -880,28 +880,23 @@ static void XGIfb_post_setmode(struct xgifb_video_info *xgifb_info)
> if ((filter >= 0) && (filter <= 7)) {
> pr_debug("FilterTable[%d]-%d: %*ph\n",
> filter_tb, filter,
> - 4, XGI_TV_filter[filter_tb].
> - filter[filter]);
> + 4, XGI_TV_filter[filter_tb].filter[filter]);
> xgifb_reg_set(
> XGIPART2,
> 0x35,
> - (XGI_TV_filter[filter_tb].
> - filter[filter][0]));
> + (XGI_TV_filter[filter_tb].filter[filter][0]));
> xgifb_reg_set(
> XGIPART2,
> 0x36,
> - (XGI_TV_filter[filter_tb].
> - filter[filter][1]));
> + (XGI_TV_filter[filter_tb].filter[filter][1]));
> xgifb_reg_set(
> XGIPART2,
> 0x37,
> - (XGI_TV_filter[filter_tb].
> - filter[filter][2]));
> + (XGI_TV_filter[filter_tb].filter[filter][2]));
> xgifb_reg_set(
> XGIPART2,
> 0x38,
> - (XGI_TV_filter[filter_tb].
> - filter[filter][3]));
> + (XGI_TV_filter[filter_tb].filter[filter][3]));
> }
> }
> }
> diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
> index 7c7c8c8f1df3..00f1ae3adcda 100644
> --- a/drivers/staging/xgifb/vb_setmode.c
> +++ b/drivers/staging/xgifb/vb_setmode.c
> @@ -221,8 +221,7 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex,
>
> for (; XGI330_RefIndex[RefreshRateTableIndex + (*i)].ModeID ==
> tempbx; (*i)--) {
> - infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)].
> - Ext_InfoFlag;
> + infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)].Ext_InfoFlag;
> if (infoflag & tempax)
> return 1;
>
> @@ -231,8 +230,7 @@ static unsigned char XGI_AjustCRT2Rate(unsigned short ModeIdIndex,
> }
>
> for ((*i) = 0;; (*i)++) {
> - infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)].
> - Ext_InfoFlag;
> + infoflag = XGI330_RefIndex[RefreshRateTableIndex + (*i)].Ext_InfoFlag;
> if (XGI330_RefIndex[RefreshRateTableIndex + (*i)].ModeID
> != tempbx) {
> return 0;
> @@ -654,8 +652,8 @@ static void XGI_UpdateXG21CRTC(unsigned short ModeNo,
> (XGI330_RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC ==
> RES640x480x60))
> index = 12;
> - else if (ModeNo == 0x2E && (XGI330_RefIndex[RefreshRateTableIndex].
> - Ext_CRT1CRTC == RES640x480x72))
> + else if (ModeNo == 0x2E && (XGI330_RefIndex[RefreshRateTableIndex].Ext_CRT1CRTC ==
> + RES640x480x72))
> index = 13;
> else if (ModeNo == 0x2F)
> index = 14;
> @@ -5092,8 +5090,7 @@ unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE,
>
> i = 0;
> do {
> - if (XGI330_RefIndex[RefreshRateTableIndex + i].
> - ModeID != ModeNo)
> + if (XGI330_RefIndex[RefreshRateTableIndex + i].ModeID != ModeNo)
> break;
> temp = XGI330_RefIndex[RefreshRateTableIndex + i].Ext_InfoFlag;
> temp &= ModeTypeMask;
> @@ -5105,8 +5102,7 @@ unsigned short XGI_GetRatePtrCRT2(struct xgi_hw_device_info *pXGIHWDE,
> } while (index != 0xFFFF);
> if (!(pVBInfo->VBInfo & SetCRT2ToRAMDAC)) {
> if (pVBInfo->VBInfo & SetInSlaveMode) {
> - temp = XGI330_RefIndex[RefreshRateTableIndex + i - 1].
> - Ext_InfoFlag;
> + temp = XGI330_RefIndex[RefreshRateTableIndex + i - 1].Ext_InfoFlag;
> if (temp & InterlaceMode)
> i++;
> }
> @@ -5483,8 +5479,7 @@ unsigned char XGISetModeNew(struct xgifb_video_info *xgifb_info,
> ModeIdIndex))
> return 0;
>
> - pVBInfo->ModeType = XGI330_EModeIDTable[ModeIdIndex].
> - Ext_ModeFlag & ModeTypeMask;
> + pVBInfo->ModeType = XGI330_EModeIDTable[ModeIdIndex].Ext_ModeFlag & ModeTypeMask;
>
> pVBInfo->SetFlag = 0;
> pVBInfo->VBInfo = DisableCRT2Display;
> --
> 2.11.0
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20170221171920.GA18917%40arushi-HP-Pavilion-Notebook.
> For more options, visit https://groups.google.com/d/optout.
>
[toc] | [prev] | [next] | [standalone]
| From | Joe Perches <joe@perches.com> |
|---|---|
| Date | 2017-02-21 19:50 +0100 |
| Subject | Re: [Outreachy kernel] [PATCH] staging: xgifb: correct the multiple line dereference to fix coding stye errors |
| Message-ID | <tdnFE-6qe-27@gated-at.bofh.it> |
| In reply to | #1585563 |
On Tue, 2017-02-21 at 18:40 +0100, Julia Lawall wrote:
>
> On Tue, 21 Feb 2017, Arushi Singhal wrote:
>
> > Error was reported by checkpatch.pl as
> > WARNING: Avoid multiple line dereference...
> > if there is boolean operator then it is fixed by Splitting line at
> > boolean operator.
>
> This is massively execeeding the 80 character boundary, and not for
> something trivial like a string. Maybe the code can be reorganized in
> some other way.
The easiest way to do that is to change the test above it
to reduce indentation from
if (xgifb_info->display2 == XGIFB_DISP_TV &&
xgifb_info->hasVB == HASVB_301) {
[code...];
}
}
to
if (xgifb_info->display2 != XGIFB_DISP_TV ||
xgifb_in
fo->hasVB != HASVB_301)
return;
[code...];
}
[toc] | [prev] | [next] | [standalone]
| From | Joe Perches <joe@perches.com> |
|---|---|
| Date | 2017-02-22 05:40 +0100 |
| Subject | Re: [Outreachy kernel] [PATCH] staging: xgifb: correct the multiple line dereference to fix coding stye errors |
| Message-ID | <tdwSC-4py-3@gated-at.bofh.it> |
| In reply to | #1585623 |
[Multipart message — attachments visible in raw view] — view raw
On Wed, 2017-02-22 at 09:46 +0530, Arushi Singhal wrote:
> On Wed, Feb 22, 2017 at 12:12 AM, Joe Perches <joe@perches.com> wrote:
>
> > On Tue, 2017-02-21 at 18:40 +0100, Julia Lawall wrote:
> > >
> > > On Tue, 21 Feb 2017, Arushi Singhal wrote:
> > >
> > > > Error was reported by checkpatch.pl as
> > > > WARNING: Avoid multiple line dereference...
> > > > if there is boolean operator then it is fixed by Splitting line at
> > > > boolean operator.
> > >
> > > This is massively execeeding the 80 character boundary, and not for
> > > something trivial like a string. Maybe the code can be reorganized in
> > > some other way.
> >
> > The easiest way to do that is to change the test above it
> > to reduce indentation from
> >
> > if (xgifb_info->display2 == XGIFB_DISP_TV &&
> > xgifb_info->hasVB == HASVB_301) {
> > [code...];
> > }
> > }
> >
> > to
> >
> > if (xgifb_info->display2 != XGIFB_DISP_TV ||
> > xgifb_in
> > fo->hasVB != HASVB_301)
> > return;
> >
> > [code...];
> > }
> >
> >
>
> Hi
> So basically you are saying that cut one word and put the other part of the
> word in the next line.
No, evolution is a horrible email client
that wraps lines oddly sometimes and sends
out different content than it displays in
its on-screen editor.
What I am saying is the block after the test
can be unindented one level by inverting the
test and using return.
It should be:
if (xgifb_info->display2 != XGIFB_DISP_TV ||
xgifb_in> > fo->hasVB != HASVB_301)
return;
[code...];
I sent you a separate attachment privately a
few hours ago but I'll attach it here too.
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web