Re: [PATCH] staging: rtl8723bs: simplify control flow

From: Greg Kroah-Hartman
Date: Sat Apr 02 2022 - 05:13:16 EST


On Fri, Apr 01, 2022 at 06:46:19PM -0400, Sevinj Aghayeva wrote:
> On Fri, Apr 01, 2022 at 02:34:04PM -0700, Ira Weiny wrote:
> > On Fri, Apr 01, 2022 at 07:46:35AM -0400, Sevinj Aghayeva wrote:
> > > The function iterates an index from 0 to NUM_PMKID_CACHE and returns
> > > the first index for which the condition is true. If no such index is
> > > found, the function returns -1. Current code has a complex control
> > > flow that obfuscates this simple task. Replace it with a loop.
> > >
> > > Also, given the shortened function body, replace the long variable
> > > name psecuritypriv with a short variable name p.
> > >
> > > Reported by checkpatch:
> > >
> > > WARNING: else is not generally useful after a break or return
> > >
> > > Signed-off-by: Sevinj Aghayeva <sevinj.aghayeva@xxxxxxxxx>
> >
> > Wow! Nice find! This is a huge clean up. Extra kudos recognizing that it is
> > not just the else statement which is broken here!
>
> Thanks! It took me a while to realize what this loop is doing.
>
> > The only issue for the patch is that I don't see any maintainer emailed?
> > However, I don't see a maintainer listed in the MAINTAINERS file so ...
> >
> > Reviewed-by: Ira Weiny <ira.weiny@xxxxxxxxx>
>
> Thanks for the review!
>
> Greg, please do not apply this yet. After I sent out the patch, I
> noticed the comment at the top of the function:
>
> /* Ported from 8185: IsInPreAuthKeyList(). (Renamed from SecIsInPreAuthKeyList(), 2006-10-13.) */
>
> So I did a git grep to find the original function and fix it as well,
> and it looks like there are three copies of the same function in
> different files:
>
> $ git grep IsInPreAuthKeyList
> r8188eu/core/rtw_mlme.c:/* Ported from 8185: IsInPreAuthKeyList(). (Renamed from SecIsInPreAuthKeyList(), 2006-10-13.) */
> rtl8712/rtl871x_mlme.c: * Ported from 8185: IsInPreAuthKeyList().
> rtl8723bs/core/rtw_mlme.c:/* Ported from 8185: IsInPreAuthKeyList(). (Renamed from SecIsInPreAuthKeyList(), 2006-10-13.) */
>
> I will later send a v2 patch that replaces all of them.

No, please do one patch per driver. These are all different drivers
(cut/pasted from some original source), so this patch is fine as-is.
You can make 2 other patches as well for the other drivers.

thanks,

greg k-h