| Message ID | 1456358932-23114-4-git-send-email-afenkart@gmail.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kalle Valo |
| Headers | show |
Hi Andreas, On Thu, Feb 25, 2016 at 11:08 AM, Andreas Fenkart <afenkart@gmail.com> wrote: > "x ? x : y" can be simplified as "x ? : y" > https://gcc.gnu.org/onlinedocs/gcc/Conditionals.html#Conditionals > > Signed-off-by: Andreas Fenkart <afenkart@gmail.com> I'm not sure people are 100% happy with changes like these, however they are correct, so Reviewed-by: Julian Calaby <julian.calaby@gmail.com> > --- > drivers/net/wireless/marvell/mwifiex/scan.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c b/drivers/net/wireless/marvell/mwifiex/scan.c > index 276382e..f612c1b 100644 > --- a/drivers/net/wireless/marvell/mwifiex/scan.c > +++ b/drivers/net/wireless/marvell/mwifiex/scan.c > @@ -845,14 +845,11 @@ mwifiex_config_scan(struct mwifiex_private *priv, > /* Set the BSS type scan filter, use Adapter setting if > unset */ > scan_cfg_out->bss_mode = > - (user_scan_in->bss_mode ? (u8) user_scan_in-> > - bss_mode : (u8) adapter->scan_mode); > + (u8)(user_scan_in->bss_mode ?: adapter->scan_mode); > > /* Set the number of probes to send, use Adapter setting > if unset */ > - num_probes = > - (user_scan_in->num_probes ? user_scan_in-> > - num_probes : adapter->scan_probes); > + num_probes = user_scan_in->num_probes ?: adapter->scan_probes; > > /* > * Set the BSSID filter to the incoming configuration, > -- > 2.7.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-wireless" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html Thanks,
diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c b/drivers/net/wireless/marvell/mwifiex/scan.c index 276382e..f612c1b 100644 --- a/drivers/net/wireless/marvell/mwifiex/scan.c +++ b/drivers/net/wireless/marvell/mwifiex/scan.c @@ -845,14 +845,11 @@ mwifiex_config_scan(struct mwifiex_private *priv, /* Set the BSS type scan filter, use Adapter setting if unset */ scan_cfg_out->bss_mode = - (user_scan_in->bss_mode ? (u8) user_scan_in-> - bss_mode : (u8) adapter->scan_mode); + (u8)(user_scan_in->bss_mode ?: adapter->scan_mode); /* Set the number of probes to send, use Adapter setting if unset */ - num_probes = - (user_scan_in->num_probes ? user_scan_in-> - num_probes : adapter->scan_probes); + num_probes = user_scan_in->num_probes ?: adapter->scan_probes; /* * Set the BSSID filter to the incoming configuration,
"x ? x : y" can be simplified as "x ? : y" https://gcc.gnu.org/onlinedocs/gcc/Conditionals.html#Conditionals Signed-off-by: Andreas Fenkart <afenkart@gmail.com> --- drivers/net/wireless/marvell/mwifiex/scan.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)