Re: [PATCH] x86/efi: Auto enable EFI memmap on SGI UV systems
From: Joseph Thelen
Date: Tue Jun 14 2016 - 18:20:07 EST
On Wed, Jun 08, 2016 at 01:12:23PM +0200, Ingo Molnar wrote:
>
> * Joseph Thelen <jthelen@xxxxxxx> wrote:
>
> > static int __init setup_add_efi_memmap(char *arg)
> > {
> > + static bool arg_as_bool;
>
> Why hidden inside local variables as static?
Likely muscle memory of some kind after being forced to do a bunch
of things in Java for awhile. Thanks for pointing that out.
>
> > + int ret = strtobool(arg, &arg_as_bool);
> > +
> > + /* check for a non-existent arg, to maintain backward compatibility */
> > + if (!arg) {
> > + add_efi_memmap = EFI_MEMMAP_ENABLED;
> > + } else {
> > + if (ret) {
> > + /* a bad argument was passed... */
> > + return ret;
> > + } else {
> > + if (arg_as_bool)
> > + add_efi_memmap = EFI_MEMMAP_ENABLED;
> > + else
> > + add_efi_memmap = EFI_MEMMAP_DISABLED;
> > + }
> > + }
> > +
> > return 0;
>
> And that's a really weird code flow!
>
> How about something straightforward:
>
> int val = 0;
> int ret;
>
> /* Check for a non-existent arg, to maintain backward compatibility: */
> if (!arg) {
> add_efi_memmap = EFI_MEMMAP_ENABLED;
> return 0;
> }
>
> ret = strtobool(arg, &val);
>
> /* Was a bad argument passed? */
> if (ret)
> return ret;
>
> if (val)
> add_efi_memmap = EFI_MEMMAP_ENABLED;
> else
> add_efi_memmap = EFI_MEMMAP_DISABLED;
>
> return 0;
>
> ?
>
> Also note the rename to 'val'.
>
> Thanks,
>
> Ingo
That certainly is much cleaner!
Having only recently come from a place where "extra" returns were to
be avoided at any cost, the fact that they do not appear to be quite so
tabo here is nice.
These changes will be made to whatever version of this comes into being
after considering Matt Fleming's comments.
Thanks,
Joseph Thelen