From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Date: Wed, 23 Jan 2019 11:12:59 +0000 Subject: Re: [PATCH] video/fbdev: refactor video= cmdline parsing Message-Id: <87ef9339vo.fsf@intel.com> List-Id: References: <20190123093817.13964-1-jani.nikula@intel.com> <20190123105830.GF3271@phenom.ffwll.local> In-Reply-To: <20190123105830.GF3271@phenom.ffwll.local> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Daniel Vetter Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Bartlomiej Zolnierkiewicz On Wed, 23 Jan 2019, Daniel Vetter wrote: > 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 Thanks. Just to be clear, I expect Bartlomiej to queue this via the fb tree (provided he agrees with the change, of course). BR, Jani. > >> --- >> 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 -- Jani Nikula, Intel Open Source Graphics Center From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] video/fbdev: refactor video= cmdline parsing Date: Wed, 23 Jan 2019 13:12:59 +0200 Message-ID: <87ef9339vo.fsf@intel.com> References: <20190123093817.13964-1-jani.nikula@intel.com> <20190123105830.GF3271@phenom.ffwll.local> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 717496EEEC for ; Wed, 23 Jan 2019 11:11:19 +0000 (UTC) In-Reply-To: <20190123105830.GF3271@phenom.ffwll.local> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Daniel Vetter Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Bartlomiej Zolnierkiewicz List-Id: dri-devel@lists.freedesktop.org T24gV2VkLCAyMyBKYW4gMjAxOSwgRGFuaWVsIFZldHRlciA8ZGFuaWVsQGZmd2xsLmNoPiB3cm90 ZToKPiBPbiBXZWQsIEphbiAyMywgMjAxOSBhdCAxMTozODoxN0FNICswMjAwLCBKYW5pIE5pa3Vs YSB3cm90ZToKPj4gTWFrZSB0aGUgdmlkZW9fc2V0dXAoKSBmdW5jdGlvbiBzbGlnaHRseSBlYXNp ZXIgdG8gcmVhZCBieSByZW1vdmluZyB0aGUKPj4gcmVwZWF0ZWQgY2hlY2tzIGZvciAhZ2xvYmFs LiBSZW1vdmUgdGhlIG1pc2xlYWRpbmcgcmV0dXJuIHZhbHVlIGNvbW1lbnQKPj4gd2hpbGUgYXQg aXQuCj4+IAo+PiBJJ20gc2xpZ2h0bHkgaGVzaXRhbnQgdG8gY2hhbmdlIGFueSBvZiB0aGlzLCBi dXQgaGVyZSBnb2VzIGFueXdheSwgd2l0aAo+PiBob3BlcyB0aGF0IHRoZSBuZXh0IHBlcnNvbiB0 byBoYXZlIHRvIGxvb2sgYXQgdGhpcyBoYXMgaXQgYSB3ZWUgYml0Cj4+IGVhc2llci4KPj4gCj4+ IFNpZ25lZC1vZmYtYnk6IEphbmkgTmlrdWxhIDxqYW5pLm5pa3VsYUBpbnRlbC5jb20+Cj4KPiBS ZXZpZXdlZC1ieTogRGFuaWVsIFZldHRlciA8ZGFuaWVsLnZldHRlckBmZndsbC5jaD4KClRoYW5r cy4KCkp1c3QgdG8gYmUgY2xlYXIsIEkgZXhwZWN0IEJhcnRsb21pZWogdG8gcXVldWUgdGhpcyB2 aWEgdGhlIGZiIHRyZWUKKHByb3ZpZGVkIGhlIGFncmVlcyB3aXRoIHRoZSBjaGFuZ2UsIG9mIGNv dXJzZSkuCgpCUiwKSmFuaS4KCgo+Cj4+IC0tLQo+PiAgZHJpdmVycy92aWRlby9mYmRldi9jb3Jl L2ZiX2NtZGxpbmUuYyB8IDIzICsrKysrKysrKystLS0tLS0tLS0tLS0tCj4+ICAxIGZpbGUgY2hh bmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0pCj4+IAo+PiBkaWZmIC0tZ2l0 IGEvZHJpdmVycy92aWRlby9mYmRldi9jb3JlL2ZiX2NtZGxpbmUuYyBiL2RyaXZlcnMvdmlkZW8v ZmJkZXYvY29yZS9mYl9jbWRsaW5lLmMKPj4gaW5kZXggMzk1MDljY2Q5MmYxLi4zYjViZDY2NmI5 NTIgMTAwNjQ0Cj4+IC0tLSBhL2RyaXZlcnMvdmlkZW8vZmJkZXYvY29yZS9mYl9jbWRsaW5lLmMK Pj4gKysrIGIvZHJpdmVycy92aWRlby9mYmRldi9jb3JlL2ZiX2NtZGxpbmUuYwo+PiBAQCAtNzUs MzYgKzc1LDMzIEBAIEVYUE9SVF9TWU1CT0woZmJfZ2V0X29wdGlvbnMpOwo+PiAgICoJTk9URTog VGhpcyBmdW5jdGlvbiBpcyBhIF9fc2V0dXAgYW5kIF9faW5pdCBmdW5jdGlvbi4KPj4gICAqICAg ICAgICAgICAgSXQgb25seSBzdG9yZXMgdGhlIG9wdGlvbnMuICBEcml2ZXJzIGhhdmUgdG8gY2Fs bAo+PiAgICogICAgICAgICAgICBmYl9nZXRfb3B0aW9ucygpIGFzIG5lY2Vzc2FyeS4KPj4gLSAq Cj4+IC0gKglSZXR1cm5zIHplcm8uCj4+IC0gKgo+PiAgICovCj4+ICBzdGF0aWMgaW50IF9faW5p dCB2aWRlb19zZXR1cChjaGFyICpvcHRpb25zKQo+PiAgewo+PiAtCWludCBpLCBnbG9iYWwgPSAw Owo+PiAtCj4+ICAJaWYgKCFvcHRpb25zIHx8ICEqb3B0aW9ucykKPj4gLQkJZ2xvYmFsID0gMTsK Pj4gKwkJZ290byBvdXQ7Cj4+ICAKPj4gLQlpZiAoIWdsb2JhbCAmJiAhc3RybmNtcChvcHRpb25z LCAib2Zvbmx5IiwgNikpIHsKPj4gKwlpZiAoIXN0cm5jbXAob3B0aW9ucywgIm9mb25seSIsIDYp KSB7Cj4+ICAJCW9mb25seSA9IDE7Cj4+IC0JCWdsb2JhbCA9IDE7Cj4+ICsJCWdvdG8gb3V0Owo+ PiAgCX0KPj4gIAo+PiAtCWlmICghZ2xvYmFsICYmICFzdHJjaHIob3B0aW9ucywgJzonKSkgewo+ PiAtCQlmYl9tb2RlX29wdGlvbiA9IG9wdGlvbnM7Cj4+IC0JCWdsb2JhbCA9IDE7Cj4+IC0JfQo+ PiArCWlmIChzdHJjaHIob3B0aW9ucywgJzonKSkgewo+PiArCQkvKiBuYW1lZCAqLwo+PiArCQlp bnQgaTsKPj4gIAo+PiAtCWlmICghZ2xvYmFsKSB7Cj4+ICAJCWZvciAoaSA9IDA7IGkgPCBGQl9N QVg7IGkrKykgewo+PiAgCQkJaWYgKHZpZGVvX29wdGlvbnNbaV0gPT0gTlVMTCkgewo+PiAgCQkJ CXZpZGVvX29wdGlvbnNbaV0gPSBvcHRpb25zOwo+PiAgCQkJCWJyZWFrOwo+PiAgCQkJfQo+PiAg CQl9Cj4+ICsJfSBlbHNlIHsKPj4gKwkJLyogZ2xvYmFsICovCj4+ICsJCWZiX21vZGVfb3B0aW9u ID0gb3B0aW9uczsKPj4gIAl9Cj4+ICAKPj4gK291dDoKPj4gIAlyZXR1cm4gMTsKPj4gIH0KPj4g IF9fc2V0dXAoInZpZGVvPSIsIHZpZGVvX3NldHVwKTsKPj4gLS0gCj4+IDIuMjAuMQo+PiAKPj4g X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KPj4gZHJpLWRl dmVsIG1haWxpbmcgbGlzdAo+PiBkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCj4+IGh0 dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCgot LSAKSmFuaSBOaWt1bGEsIEludGVsIE9wZW4gU291cmNlIEdyYXBoaWNzIENlbnRlcgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGlu ZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK