From: Andrew Miller <amiller@amilx.com>
To: Joe Perches <joe@perches.com>
Cc: gregkh@linuxfoundation.org, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Staging: rtl8187se: r8180_core.c: Fix coding style issue
Date: Tue, 13 Mar 2012 21:49:50 -0400 [thread overview]
Message-ID: <20120314014949.GB7156@iron> (raw)
In-Reply-To: <1331688836.27389.13.camel@joe2Laptop>
On Tue, Mar 13, 2012 at 06:33:56PM -0700, Joe Perches wrote:
> On Tue, 2012-03-13 at 20:58 -0400, Andrew Miller wrote:
> > Fix long line coding style issue
> > Signed-off-by: Andrew Miller <amiller@amilx.com>
Thanks for the review
I think I starting to get the idea of what I need to be looking for.
>
> Hi Andrew.
>
> Please strive for clarity instead of just fixing
> random 80 char warnings.
>
> > diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c
> []
> > @@ -1607,17 +1609,20 @@ void rtl8180_rx(struct net_device *dev)
> > /* printk("==========================>rx : RXAGC is %d,signalstrength is %d\n",RXAGC,stats.signalstrength); */
> > stats.rssi = priv->wstats.qual.qual = priv->SignalQuality;
> > stats.noise = priv->wstats.qual.noise = 100 - priv->wstats.qual.qual;
> > - bHwError = (((*(priv->rxringtail)) & (0x00000fff)) == 4080) | (((*(priv->rxringtail)) & (0x04000000)) != 0)
> > - | (((*(priv->rxringtail)) & (0x08000000)) != 0) | (((~(*(priv->rxringtail))) & (0x10000000)) != 0) | (((~(*(priv->rxringtail))) & (0x20000000)) != 0);
> > + bHwError = (((*(priv->rxringtail)) & (0x00000fff)) == 4080) |
> > + (((*(priv->rxringtail)) & (0x04000000)) != 0) |
> > + (((*(priv->rxringtail)) & (0x08000000)) != 0) |
> > + (((~(*(priv->rxringtail))) & (0x10000000)) != 0) |
> > + (((~(*(priv->rxringtail))) & (0x20000000)) != 0);
>
> Likely these | uses should be ||
I'm not really sure what you mean, do you mean I should change '|' to '||"?
like this
bHwError = (((*(priv->rxringtail)) & (0x00000fff)) == 4080) ||
(((*(priv->rxringtail)) & (0x04000000)) != 0) ||
(((*(priv->rxringtail)) & (0x08000000)) != 0) ||
(((~(*(priv->rxringtail))) & (0x10000000)) != 0) ||
(((~(*(priv->rxringtail))) & (0x20000000)) != 0);
>
> > bCRC = ((*(priv->rxringtail)) & (0x00002000)) >> 13;
> > bICV = ((*(priv->rxringtail)) & (0x00001000)) >> 12;
> > hdr = (struct ieee80211_hdr_4addr *)priv->rxbuffer->buf;
> > fc = le16_to_cpu(hdr->frame_ctl);
> > type = WLAN_FC_GET_TYPE(fc);
> >
> > - if ((IEEE80211_FTYPE_CTL != type) &&
> > - (eqMacAddr(priv->ieee80211->current_network.bssid, (fc & IEEE80211_FCTL_TODS) ? hdr->addr1 : (fc & IEEE80211_FCTL_FROMDS) ? hdr->addr2 : hdr->addr3))
> > - && (!bHwError) && (!bCRC) && (!bICV)) {
> > + if ((IEEE80211_FTYPE_CTL != type) && (eqMacAddr(priv->ieee80211->current_network.bssid,
> > + (fc & IEEE80211_FCTL_TODS) ? hdr->addr1 : (fc & IEEE80211_FCTL_FROMDS) ? hdr->addr2 : hdr->addr3))
> > + && (!bHwError) && (!bCRC) && (!bICV)) {
>
> This is difficult to read and could be better written
> removing unnecessary parentheses and making the egMacAddr
> clearer as a function/macro call:
>
> if (IEEE80211_FTYPE_CTL != type &&
> eqMacAddr(priv->ieee80211->current_network.bssid,
> fc & IEEE80211_FCTL_TODS ? hdr->addr1 :
> fc & IEEE80211_FCTL_FROMDS ? hdr->addr2 :
> hdr->addr3) &&
> !bHwError &&
> !bCRC &&
> !bICV)
>
> It might be better to reshuffle the test order too:
> if (IEEE80211_FTYPE_CTL != type &&
> !bHwError && bCRC && !bICV &&
> eqMacAddr(priv->ieee80211->current_network.bssid,
> fc & IEEE80211_FCTL_TODS ? hdr->addr1 :
> fc & IEEE80211_FCTL_FROMDS ? hdr->addr2 :
> hdr->addr3))
>
> etc...
That does look much cleaner, It never occurred to me that I can do that.
Thanks for your help, I'm really trying to do better, I will have this fix up tomorrow for another review.
next prev parent reply other threads:[~2012-03-14 1:51 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-14 0:58 [PATCH] Staging: rtl8187se: r8180_core.c: Fix coding style issue Andrew Miller
2012-03-14 1:33 ` Joe Perches
2012-03-14 1:49 ` Andrew Miller [this message]
2012-03-14 2:12 ` Joe Perches
2012-03-14 2:33 ` Andrew Miller
2012-03-14 2:46 ` Joe Perches
2012-03-14 3:09 ` Larry Finger
2012-03-14 2:54 ` Greg KH
2012-03-14 4:18 ` Ryan Mallon
2012-03-14 4:49 ` Joe Perches
-- strict thread matches above, loose matches on Subject: below --
2012-03-11 4:32 Andrew Miller
2012-03-13 22:42 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120314014949.GB7156@iron \
--to=amiller@amilx.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.