From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Date: Wed, 23 Jan 2019 10:58:30 +0000 Subject: Re: [PATCH] video/fbdev: refactor video= cmdline parsing Message-Id: <20190123105830.GF3271@phenom.ffwll.local> List-Id: References: <20190123093817.13964-1-jani.nikula@intel.com> In-Reply-To: <20190123093817.13964-1-jani.nikula@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Jani Nikula Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Bartlomiej Zolnierkiewicz On Wed, Jan 23, 2019 at 11:38:17AM +0200, Jani Nikula wrote: > Make the video_setup() function slightly easier to read by removing the > repeated checks for !global. Remove the misleading return value comment > while at it. > > I'm slightly hesitant to change any of this, but here goes anyway, with > hopes that the next person to have to look at this has it a wee bit > easier. > > Signed-off-by: Jani Nikula Reviewed-by: Daniel Vetter > --- > drivers/video/fbdev/core/fb_cmdline.c | 23 ++++++++++------------- > 1 file changed, 10 insertions(+), 13 deletions(-) > > diff --git a/drivers/video/fbdev/core/fb_cmdline.c b/drivers/video/fbdev/core/fb_cmdline.c > index 39509ccd92f1..3b5bd666b952 100644 > --- a/drivers/video/fbdev/core/fb_cmdline.c > +++ b/drivers/video/fbdev/core/fb_cmdline.c > @@ -75,36 +75,33 @@ EXPORT_SYMBOL(fb_get_options); > * NOTE: This function is a __setup and __init function. > * It only stores the options. Drivers have to call > * fb_get_options() as necessary. > - * > - * Returns zero. > - * > */ > static int __init video_setup(char *options) > { > - int i, global = 0; > - > if (!options || !*options) > - global = 1; > + goto out; > > - if (!global && !strncmp(options, "ofonly", 6)) { > + if (!strncmp(options, "ofonly", 6)) { > ofonly = 1; > - global = 1; > + goto out; > } > > - if (!global && !strchr(options, ':')) { > - fb_mode_option = options; > - global = 1; > - } > + if (strchr(options, ':')) { > + /* named */ > + int i; > > - if (!global) { > for (i = 0; i < FB_MAX; i++) { > if (video_options[i] = NULL) { > video_options[i] = options; > break; > } > } > + } else { > + /* global */ > + fb_mode_option = options; > } > > +out: > return 1; > } > __setup("video=", video_setup); > -- > 2.20.1 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] video/fbdev: refactor video= cmdline parsing Date: Wed, 23 Jan 2019 11:58:30 +0100 Message-ID: <20190123105830.GF3271@phenom.ffwll.local> References: <20190123093817.13964-1-jani.nikula@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-ed1-x541.google.com (mail-ed1-x541.google.com [IPv6:2a00:1450:4864:20::541]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9811B6E4E9 for ; Wed, 23 Jan 2019 10:58:34 +0000 (UTC) Received: by mail-ed1-x541.google.com with SMTP id b3so1360394ede.1 for ; Wed, 23 Jan 2019 02:58:34 -0800 (PST) Content-Disposition: inline In-Reply-To: <20190123093817.13964-1-jani.nikula@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Jani Nikula Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Bartlomiej Zolnierkiewicz List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCBKYW4gMjMsIDIwMTkgYXQgMTE6Mzg6MTdBTSArMDIwMCwgSmFuaSBOaWt1bGEgd3Jv dGU6Cj4gTWFrZSB0aGUgdmlkZW9fc2V0dXAoKSBmdW5jdGlvbiBzbGlnaHRseSBlYXNpZXIgdG8g cmVhZCBieSByZW1vdmluZyB0aGUKPiByZXBlYXRlZCBjaGVja3MgZm9yICFnbG9iYWwuIFJlbW92 ZSB0aGUgbWlzbGVhZGluZyByZXR1cm4gdmFsdWUgY29tbWVudAo+IHdoaWxlIGF0IGl0Lgo+IAo+ IEknbSBzbGlnaHRseSBoZXNpdGFudCB0byBjaGFuZ2UgYW55IG9mIHRoaXMsIGJ1dCBoZXJlIGdv ZXMgYW55d2F5LCB3aXRoCj4gaG9wZXMgdGhhdCB0aGUgbmV4dCBwZXJzb24gdG8gaGF2ZSB0byBs b29rIGF0IHRoaXMgaGFzIGl0IGEgd2VlIGJpdAo+IGVhc2llci4KPiAKPiBTaWduZWQtb2ZmLWJ5 OiBKYW5pIE5pa3VsYSA8amFuaS5uaWt1bGFAaW50ZWwuY29tPgoKUmV2aWV3ZWQtYnk6IERhbmll bCBWZXR0ZXIgPGRhbmllbC52ZXR0ZXJAZmZ3bGwuY2g+Cgo+IC0tLQo+ICBkcml2ZXJzL3ZpZGVv L2ZiZGV2L2NvcmUvZmJfY21kbGluZS5jIHwgMjMgKysrKysrKysrKy0tLS0tLS0tLS0tLS0KPiAg MSBmaWxlIGNoYW5nZWQsIDEwIGluc2VydGlvbnMoKyksIDEzIGRlbGV0aW9ucygtKQo+IAo+IGRp ZmYgLS1naXQgYS9kcml2ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJfY21kbGluZS5jIGIvZHJpdmVy cy92aWRlby9mYmRldi9jb3JlL2ZiX2NtZGxpbmUuYwo+IGluZGV4IDM5NTA5Y2NkOTJmMS4uM2I1 YmQ2NjZiOTUyIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvdmlkZW8vZmJkZXYvY29yZS9mYl9jbWRs aW5lLmMKPiArKysgYi9kcml2ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJfY21kbGluZS5jCj4gQEAg LTc1LDM2ICs3NSwzMyBAQCBFWFBPUlRfU1lNQk9MKGZiX2dldF9vcHRpb25zKTsKPiAgICoJTk9U RTogVGhpcyBmdW5jdGlvbiBpcyBhIF9fc2V0dXAgYW5kIF9faW5pdCBmdW5jdGlvbi4KPiAgICog ICAgICAgICAgICBJdCBvbmx5IHN0b3JlcyB0aGUgb3B0aW9ucy4gIERyaXZlcnMgaGF2ZSB0byBj YWxsCj4gICAqICAgICAgICAgICAgZmJfZ2V0X29wdGlvbnMoKSBhcyBuZWNlc3NhcnkuCj4gLSAq Cj4gLSAqCVJldHVybnMgemVyby4KPiAtICoKPiAgICovCj4gIHN0YXRpYyBpbnQgX19pbml0IHZp ZGVvX3NldHVwKGNoYXIgKm9wdGlvbnMpCj4gIHsKPiAtCWludCBpLCBnbG9iYWwgPSAwOwo+IC0K PiAgCWlmICghb3B0aW9ucyB8fCAhKm9wdGlvbnMpCj4gLQkJZ2xvYmFsID0gMTsKPiArCQlnb3Rv IG91dDsKPiAgCj4gLQlpZiAoIWdsb2JhbCAmJiAhc3RybmNtcChvcHRpb25zLCAib2Zvbmx5Iiwg NikpIHsKPiArCWlmICghc3RybmNtcChvcHRpb25zLCAib2Zvbmx5IiwgNikpIHsKPiAgCQlvZm9u bHkgPSAxOwo+IC0JCWdsb2JhbCA9IDE7Cj4gKwkJZ290byBvdXQ7Cj4gIAl9Cj4gIAo+IC0JaWYg KCFnbG9iYWwgJiYgIXN0cmNocihvcHRpb25zLCAnOicpKSB7Cj4gLQkJZmJfbW9kZV9vcHRpb24g PSBvcHRpb25zOwo+IC0JCWdsb2JhbCA9IDE7Cj4gLQl9Cj4gKwlpZiAoc3RyY2hyKG9wdGlvbnMs ICc6JykpIHsKPiArCQkvKiBuYW1lZCAqLwo+ICsJCWludCBpOwo+ICAKPiAtCWlmICghZ2xvYmFs KSB7Cj4gIAkJZm9yIChpID0gMDsgaSA8IEZCX01BWDsgaSsrKSB7Cj4gIAkJCWlmICh2aWRlb19v cHRpb25zW2ldID09IE5VTEwpIHsKPiAgCQkJCXZpZGVvX29wdGlvbnNbaV0gPSBvcHRpb25zOwo+ ICAJCQkJYnJlYWs7Cj4gIAkJCX0KPiAgCQl9Cj4gKwl9IGVsc2Ugewo+ICsJCS8qIGdsb2JhbCAq Lwo+ICsJCWZiX21vZGVfb3B0aW9uID0gb3B0aW9uczsKPiAgCX0KPiAgCj4gK291dDoKPiAgCXJl dHVybiAxOwo+ICB9Cj4gIF9fc2V0dXAoInZpZGVvPSIsIHZpZGVvX3NldHVwKTsKPiAtLSAKPiAy LjIwLjEKPiAKPiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f Xwo+IGRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKPiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCj4gaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmkt ZGV2ZWwKCi0tIApEYW5pZWwgVmV0dGVyClNvZnR3YXJlIEVuZ2luZWVyLCBJbnRlbCBDb3Jwb3Jh dGlvbgpodHRwOi8vYmxvZy5mZndsbC5jaApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWwK