Re: [PATCH v2 6/8] staging: r8188eu: simplify if-else statement

Greg KH
2022-03-31T05:53:08Z

On Tue, Mar 29, 2022 at 10:21:39PM +0200, Michael Straube wrote:
> Simplify a nested if-else statement to a single if-else statement in
> rtw_set_threshold(). This improves readability and allows us to
> remove the local variable threshold.
>
> Signed-off-by: Michael Straube <straube.linux@gmail.com>
> ---
> v2: Better readable simplification.
>
> drivers/staging/r8188eu/core/rtw_mlme.c | 14 ++++----------
> 1 file changed, 4 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r8188eu/core/rtw_mlme.c
> index 086d64542082..1d52cfac1999 100644
> --- a/drivers/staging/r8188eu/core/rtw_mlme.c
> +++ b/drivers/staging/r8188eu/core/rtw_mlme.c
> @@ -1789,20 +1789,14 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter)
>
> static void rtw_set_threshold(struct adapter *adapter)
> {
> - u8 threshold;
> struct mlme_priv *mlmepriv = &adapter->mlmepriv;
> struct ht_priv *htpriv = &mlmepriv->htpriv;
>
> - /* TH = 1 => means that invalidate usb rx aggregation */
> - /* TH = 0 => means that validate usb rx aggregation, use init value. */
> - if (htpriv->ht_option) {
> - if (adapter->registrypriv.wifi_spec == 1)
> - threshold = 1;
> - else
> - threshold = USB_RXAGG_PAGE_COUNT;
> -
> - rtw_write8(adapter, REG_RXDMA_AGG_PG_TH, threshold);
> + if (htpriv->ht_option && adapter->registrypriv.wifi_spec != 1) {
> + /* validate usb rx aggregation, use init value. */
> + rtw_write8(adapter, REG_RXDMA_AGG_PG_TH, USB_RXAGG_PAGE_COUNT);
> } else {
> + /* invalidate usb rx aggregation */
> rtw_write8(adapter, REG_RXDMA_AGG_PG_TH, 1);
> }
> }
> --
> 2.35.1

Oh nevermind, you already cleaned it up, sorry for the noise :)

greg k-h