From: Maya Nakamura <m.maya.nakamura@gmail.com>
To: Julia Lawall <julia.lawall@lip6.fr>
Cc: gregkh@linuxfoundation.org, outreachy-kernel@googlegroups.com
Subject: Re: [Outreachy kernel] [PATCH] staging: rtlwifi: Remove unnecessary conditions
Date: Tue, 30 Oct 2018 17:06:15 -0700 [thread overview]
Message-ID: <20181031000614.GA2226@k-vBox> (raw)
In-Reply-To: <alpine.DEB.2.21.1810300845370.2443@hadrien>
On Tue, Oct 30, 2018 at 08:46:21AM +0100, Julia Lawall wrote:
>
>
> On Mon, 29 Oct 2018, Maya Nakamura wrote:
>
> > Remove conditions with no effect at four different sections. Issues found
> > by Coccinelle's semantic patch results for cond_no_effect.cocci. Edit two
> > statements to keep expressions on one line--one from Julia's feedback.
> > Eliminate checkpatch result, a line should not end with a parenthesis.
> >
> > Signed-off-by: Maya Nakamura <m.maya.nakamura@gmail.com>
> > ---
> > drivers/staging/rtlwifi/phydm/phydm_debug.c | 35 +++++++------------
> > drivers/staging/rtlwifi/phydm/phydm_dig.c | 9 ++---
> > .../staging/rtlwifi/phydm/phydm_hwconfig.c | 6 ++--
> > drivers/staging/rtlwifi/phydm/phydm_psd.c | 7 +---
> > 4 files changed, 17 insertions(+), 40 deletions(-)
> >
> > diff --git a/drivers/staging/rtlwifi/phydm/phydm_debug.c b/drivers/staging/rtlwifi/phydm/phydm_debug.c
> > index b5b69d5f1a41..91f2c054d83b 100644
> > --- a/drivers/staging/rtlwifi/phydm/phydm_debug.c
> > +++ b/drivers/staging/rtlwifi/phydm/phydm_debug.c
> > @@ -140,26 +140,17 @@ static inline void phydm_print_csi(struct phy_dm_struct *dm, u32 used,
> > dword_h = odm_get_bb_reg(dm, 0xF74, MASKDWORD);
> > dword_l = odm_get_bb_reg(dm, 0xF5C, MASKDWORD);
> >
> > - if (index % 2 == 0)
> > - PHYDM_SNPRINTF(
> > - output + used, out_len - used,
> > - "%02x %02x %02x %02x %02x %02x %02x %02x\n",
> > - dword_l & MASKBYTE0, (dword_l & MASKBYTE1) >> 8,
> > - (dword_l & MASKBYTE2) >> 16,
> > - (dword_l & MASKBYTE3) >> 24,
> > - dword_h & MASKBYTE0, (dword_h & MASKBYTE1) >> 8,
> > - (dword_h & MASKBYTE2) >> 16,
> > - (dword_h & MASKBYTE3) >> 24);
> > - else
> > - PHYDM_SNPRINTF(
> > - output + used, out_len - used,
> > - "%02x %02x %02x %02x %02x %02x %02x %02x\n",
> > - dword_l & MASKBYTE0, (dword_l & MASKBYTE1) >> 8,
> > - (dword_l & MASKBYTE2) >> 16,
> > - (dword_l & MASKBYTE3) >> 24,
> > - dword_h & MASKBYTE0, (dword_h & MASKBYTE1) >> 8,
> > - (dword_h & MASKBYTE2) >> 16,
> > - (dword_h & MASKBYTE3) >> 24);
> > + PHYDM_SNPRINTF(output + used,
> > + out_len - used,
> > + "%02x %02x %02x %02x %02x %02x %02x %02x\n",
> > + dword_l & MASKBYTE0,
> > + (dword_l & MASKBYTE1) >> 8,
> > + (dword_l & MASKBYTE2) >> 16,
> > + (dword_l & MASKBYTE3) >> 24,
> > + dword_h & MASKBYTE0,
> > + (dword_h & MASKBYTE1) >> 8,
> > + (dword_h & MASKBYTE2) >> 16,
> > + (dword_h & MASKBYTE3) >> 24);
> > }
> > }
> >
> > @@ -168,9 +159,7 @@ void phydm_init_debug_setting(struct phy_dm_struct *dm)
> > dm->debug_level = ODM_DBG_TRACE;
> >
> > dm->fw_debug_components = 0;
> > - dm->debug_components =
> > -
> > - 0;
> > + dm->debug_components = 0;
>
>
> Does this belong here? I don't see an if nearby. You should make a
> series if you want to do two different things on the same file.
>
> julia
Thank you, Julia, for reviewing my submission! I will separate different
types of fixes into their own patches and resend these.
Maya
> >
> > dm->fw_buff_is_enpty = true;
> > dm->pre_c2h_seq = 0;
> > diff --git a/drivers/staging/rtlwifi/phydm/phydm_dig.c b/drivers/staging/rtlwifi/phydm/phydm_dig.c
> > index f10776fbe2d9..99c805cc380b 100644
> > --- a/drivers/staging/rtlwifi/phydm/phydm_dig.c
> > +++ b/drivers/staging/rtlwifi/phydm/phydm_dig.c
> > @@ -599,13 +599,8 @@ void odm_dig_init(void *dm_void)
> > (DM_DIG_MAX_PAUSE_TYPE + 1));
> > dig_tab->pause_cckpd_level = 0;
> >
> > - if (dm->board_type & (ODM_BOARD_EXT_PA | ODM_BOARD_EXT_LNA)) {
> > - dig_tab->rx_gain_range_max = DM_DIG_MAX_NIC;
> > - dig_tab->rx_gain_range_min = DM_DIG_MIN_NIC;
> > - } else {
> > - dig_tab->rx_gain_range_max = DM_DIG_MAX_NIC;
> > - dig_tab->rx_gain_range_min = DM_DIG_MIN_NIC;
> > - }
> > + dig_tab->rx_gain_range_max = DM_DIG_MAX_NIC;
> > + dig_tab->rx_gain_range_min = DM_DIG_MIN_NIC;
> >
> > dig_tab->enable_adjust_big_jump = 1;
> > if (dm->support_ic_type & ODM_RTL8822B) {
> > diff --git a/drivers/staging/rtlwifi/phydm/phydm_hwconfig.c b/drivers/staging/rtlwifi/phydm/phydm_hwconfig.c
> > index e1544e38944b..2f4f273a0239 100644
> > --- a/drivers/staging/rtlwifi/phydm/phydm_hwconfig.c
> > +++ b/drivers/staging/rtlwifi/phydm/phydm_hwconfig.c
> > @@ -45,8 +45,8 @@ static u32 phydm_process_rssi_pwdb(struct phy_dm_struct *dm,
> > u32 weighting = 0, undecorated_smoothed_pwdb;
> > /* 2011.07.28 LukeLee: modified to prevent unstable CCK RSSI */
> >
> > - if (entry->rssi_stat.ofdm_pkt ==
> > - 64) { /* speed up when all packets are OFDM*/
> > + if (entry->rssi_stat.ofdm_pkt == 64) {
> > + /* speed up when all packets are OFDM*/
> > undecorated_smoothed_pwdb = undecorated_smoothed_ofdm;
> > ODM_RT_TRACE(dm, ODM_COMP_RSSI_MONITOR,
> > "PWDB_0[%d] = (( %d ))\n", pktinfo->station_id,
> > @@ -1719,8 +1719,6 @@ static void phydm_get_rx_phy_status_type2(struct phy_dm_struct *dm,
> > ODM_RTL8710B)) { /* JJ ADD 20161014 */
> > if (rxsc == 3)
> > bw = ODM_BW40M;
> > - else if ((rxsc == 1) || (rxsc == 2))
> > - bw = ODM_BW20M;
> > else
> > bw = ODM_BW20M;
> > }
> > diff --git a/drivers/staging/rtlwifi/phydm/phydm_psd.c b/drivers/staging/rtlwifi/phydm/phydm_psd.c
> > index badc514ac0be..c93d871f1eb6 100644
> > --- a/drivers/staging/rtlwifi/phydm/phydm_psd.c
> > +++ b/drivers/staging/rtlwifi/phydm/phydm_psd.c
> > @@ -336,12 +336,7 @@ void phydm_psd_init(void *dm_void)
> > 2; /*2b'11: 20MHz, 2b'10: 40MHz, 2b'01: 80MHz */
> > }
> >
> > - if (dm->support_ic_type == ODM_RTL8812)
> > - dm_psd_table->psd_pwr_common_offset = 0;
> > - else if (dm->support_ic_type == ODM_RTL8821)
> > - dm_psd_table->psd_pwr_common_offset = 0;
> > - else
> > - dm_psd_table->psd_pwr_common_offset = 0;
> > + dm_psd_table->psd_pwr_common_offset = 0;
> >
> > phydm_psd_para_setting(dm, 1, 2, 3, 128, 0, 0, 7, 0);
> > /*phydm_psd(dm, 0x3c, 0, 127);*/ /* target at -50dBm */
> > --
> > 2.17.1
> >
> > --
> > 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/20181030063636.GA5098%40k-vBox.
> > For more options, visit https://groups.google.com/d/optout.
> >
next prev parent reply other threads:[~2018-10-31 0:06 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-30 6:36 [PATCH] staging: rtlwifi: Remove unnecessary conditions Maya Nakamura
2018-10-30 7:46 ` [Outreachy kernel] " Julia Lawall
2018-10-31 0:06 ` Maya Nakamura [this message]
2018-10-31 0:31 ` Sasha Levin
2018-10-31 5:01 ` Maya Nakamura
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=20181031000614.GA2226@k-vBox \
--to=m.maya.nakamura@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=julia.lawall@lip6.fr \
--cc=outreachy-kernel@googlegroups.com \
/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.