From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Wed, 21 Sep 2016 07:26:48 +0000 Subject: [PATCH 3/5] GPU-DRM-nouveau: Delete unnecessary braces Message-Id: <74cc2e34-cb5f-e3c9-e6cd-aa24ed3529e3@users.sourceforge.net> List-Id: References: <5bcff2ec-f3bd-ab9c-e13d-3a4f5cf7c73b@users.sourceforge.net> In-Reply-To: <5bcff2ec-f3bd-ab9c-e13d-3a4f5cf7c73b@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, Ben Skeggs , David Airlie , Martin Peres , Roy Spliet Cc: trivial@kernel.org, kernel-janitors@vger.kernel.org, LKML , Julia Lawall From: Markus Elfring Date: Wed, 21 Sep 2016 08:28:08 +0200 Do not use curly brackets at four source code places where a single statement should be sufficient. Signed-off-by: Markus Elfring --- drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c index dbaf577..cb50539 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c @@ -127,12 +127,11 @@ gt215_link_train_calc(u32 *vals, struct gt215_ltrain *train) } /* Find the best value for 0x1111e0 */ - for (i = 0; i < 4; i++) { + for (i = 0; i < 4; i++) if (bins[i] > qty) { bin = i + 3; qty = bins[i]; } - } train->r_100720 = 0; for (i = 0; i < 8; i++) { @@ -729,9 +728,8 @@ gt215_ram_calc(struct nvkm_ram *base, u32 freq) ram_mask(fuc, 0x1007e0, 0x22222222, r100760); } - if (device->chipset = 0xa3 && freq > 500000) { + if (device->chipset = 0xa3 && freq > 500000) ram_mask(fuc, 0x100700, 0x00000006, 0x00000000); - } /* Final switch */ if (mclk.pll) { @@ -745,12 +743,11 @@ gt215_ram_calc(struct nvkm_ram *base, u32 freq) ram_nsec(fuc, 2000); /* Set RAM MR parameters and timings */ - for (i = 2; i >= 0; i--) { + for (i = 2; i >= 0; i--) if (ram_rd32(fuc, mr[i]) != ram->base.mr[i]) { ram_wr32(fuc, mr[i], ram->base.mr[i]); ram_nsec(fuc, 1000); } - } ram_wr32(fuc, 0x100220[3], timing[3]); ram_wr32(fuc, 0x100220[1], timing[1]); @@ -838,11 +835,10 @@ gt215_ram_calc(struct nvkm_ram *base, u32 freq) if (!next->bios.ramcfg_DLLoff) nvkm_sddr2_dll_reset(fuc); - if (ram->base.type = NVKM_RAM_TYPE_GDDR3) { + if (ram->base.type = NVKM_RAM_TYPE_GDDR3) ram_nsec(fuc, 31000); - } else { + else ram_nsec(fuc, 14000); - } if (ram->base.type = NVKM_RAM_TYPE_DDR3) { ram_wr32(fuc, 0x100264, 0x1); -- 2.10.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Subject: [PATCH 3/5] GPU-DRM-nouveau: Delete unnecessary braces Date: Wed, 21 Sep 2016 09:26:48 +0200 Message-ID: <74cc2e34-cb5f-e3c9-e6cd-aa24ed3529e3@users.sourceforge.net> References: <5bcff2ec-f3bd-ab9c-e13d-3a4f5cf7c73b@users.sourceforge.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <5bcff2ec-f3bd-ab9c-e13d-3a4f5cf7c73b@users.sourceforge.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, Ben Skeggs , David Airlie , Martin Peres , Roy Spliet Cc: trivial@kernel.org, kernel-janitors@vger.kernel.org, LKML , Julia Lawall List-Id: nouveau.vger.kernel.org RnJvbTogTWFya3VzIEVsZnJpbmcgPGVsZnJpbmdAdXNlcnMuc291cmNlZm9yZ2UubmV0PgpEYXRl OiBXZWQsIDIxIFNlcCAyMDE2IDA4OjI4OjA4ICswMjAwCgpEbyBub3QgdXNlIGN1cmx5IGJyYWNr ZXRzIGF0IGZvdXIgc291cmNlIGNvZGUgcGxhY2VzCndoZXJlIGEgc2luZ2xlIHN0YXRlbWVudCBz aG91bGQgYmUgc3VmZmljaWVudC4KClNpZ25lZC1vZmYtYnk6IE1hcmt1cyBFbGZyaW5nIDxlbGZy aW5nQHVzZXJzLnNvdXJjZWZvcmdlLm5ldD4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9u dmttL3N1YmRldi9mYi9yYW1ndDIxNS5jIHwgMTQgKysrKystLS0tLS0tLS0KIDEgZmlsZSBjaGFu Z2VkLCA1IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL25vdXZlYXUvbnZrbS9zdWJkZXYvZmIvcmFtZ3QyMTUuYyBiL2RyaXZlcnMvZ3B1 L2RybS9ub3V2ZWF1L252a20vc3ViZGV2L2ZiL3JhbWd0MjE1LmMKaW5kZXggZGJhZjU3Ny4uY2I1 MDUzOSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbnZrbS9zdWJkZXYvZmIv cmFtZ3QyMTUuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9udmttL3N1YmRldi9mYi9y YW1ndDIxNS5jCkBAIC0xMjcsMTIgKzEyNywxMSBAQCBndDIxNV9saW5rX3RyYWluX2NhbGModTMy ICp2YWxzLCBzdHJ1Y3QgZ3QyMTVfbHRyYWluICp0cmFpbikKIAl9CiAKIAkvKiBGaW5kIHRoZSBi ZXN0IHZhbHVlIGZvciAweDExMTFlMCAqLwotCWZvciAoaSA9IDA7IGkgPCA0OyBpKyspIHsKKwlm b3IgKGkgPSAwOyBpIDwgNDsgaSsrKQogCQlpZiAoYmluc1tpXSA+IHF0eSkgewogCQkJYmluID0g aSArIDM7CiAJCQlxdHkgPSBiaW5zW2ldOwogCQl9Ci0JfQogCiAJdHJhaW4tPnJfMTAwNzIwID0g MDsKIAlmb3IgKGkgPSAwOyBpIDwgODsgaSsrKSB7CkBAIC03MjksOSArNzI4LDggQEAgZ3QyMTVf cmFtX2NhbGMoc3RydWN0IG52a21fcmFtICpiYXNlLCB1MzIgZnJlcSkKIAkJcmFtX21hc2soZnVj LCAweDEwMDdlMCwgMHgyMjIyMjIyMiwgcjEwMDc2MCk7CiAJfQogCi0JaWYgKGRldmljZS0+Y2hp cHNldCA9PSAweGEzICYmIGZyZXEgPiA1MDAwMDApIHsKKwlpZiAoZGV2aWNlLT5jaGlwc2V0ID09 IDB4YTMgJiYgZnJlcSA+IDUwMDAwMCkKIAkJcmFtX21hc2soZnVjLCAweDEwMDcwMCwgMHgwMDAw MDAwNiwgMHgwMDAwMDAwMCk7Ci0JfQogCiAJLyogRmluYWwgc3dpdGNoICovCiAJaWYgKG1jbGsu cGxsKSB7CkBAIC03NDUsMTIgKzc0MywxMSBAQCBndDIxNV9yYW1fY2FsYyhzdHJ1Y3QgbnZrbV9y YW0gKmJhc2UsIHUzMiBmcmVxKQogCXJhbV9uc2VjKGZ1YywgMjAwMCk7CiAKIAkvKiBTZXQgUkFN IE1SIHBhcmFtZXRlcnMgYW5kIHRpbWluZ3MgKi8KLQlmb3IgKGkgPSAyOyBpID49IDA7IGktLSkg eworCWZvciAoaSA9IDI7IGkgPj0gMDsgaS0tKQogCQlpZiAocmFtX3JkMzIoZnVjLCBtcltpXSkg IT0gcmFtLT5iYXNlLm1yW2ldKSB7CiAJCQlyYW1fd3IzMihmdWMsIG1yW2ldLCByYW0tPmJhc2Uu bXJbaV0pOwogCQkJcmFtX25zZWMoZnVjLCAxMDAwKTsKIAkJfQotCX0KIAogCXJhbV93cjMyKGZ1 YywgMHgxMDAyMjBbM10sIHRpbWluZ1szXSk7CiAJcmFtX3dyMzIoZnVjLCAweDEwMDIyMFsxXSwg dGltaW5nWzFdKTsKQEAgLTgzOCwxMSArODM1LDEwIEBAIGd0MjE1X3JhbV9jYWxjKHN0cnVjdCBu dmttX3JhbSAqYmFzZSwgdTMyIGZyZXEpCiAJaWYgKCFuZXh0LT5iaW9zLnJhbWNmZ19ETExvZmYp CiAJCW52a21fc2RkcjJfZGxsX3Jlc2V0KGZ1Yyk7CiAKLQlpZiAocmFtLT5iYXNlLnR5cGUgPT0g TlZLTV9SQU1fVFlQRV9HRERSMykgeworCWlmIChyYW0tPmJhc2UudHlwZSA9PSBOVktNX1JBTV9U WVBFX0dERFIzKQogCQlyYW1fbnNlYyhmdWMsIDMxMDAwKTsKLQl9IGVsc2UgeworCWVsc2UKIAkJ cmFtX25zZWMoZnVjLCAxNDAwMCk7Ci0JfQogCiAJaWYgKHJhbS0+YmFzZS50eXBlID09IE5WS01f UkFNX1RZUEVfRERSMykgewogCQlyYW1fd3IzMihmdWMsIDB4MTAwMjY0LCAweDEpOwotLSAKMi4x MC4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmkt ZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932833AbcIUH1L (ORCPT ); Wed, 21 Sep 2016 03:27:11 -0400 Received: from mout.web.de ([212.227.15.4]:56395 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932754AbcIUH1H (ORCPT ); Wed, 21 Sep 2016 03:27:07 -0400 Subject: [PATCH 3/5] GPU-DRM-nouveau: Delete unnecessary braces To: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, Ben Skeggs , David Airlie , Martin Peres , Roy Spliet References: <5bcff2ec-f3bd-ab9c-e13d-3a4f5cf7c73b@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, trivial@kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <74cc2e34-cb5f-e3c9-e6cd-aa24ed3529e3@users.sourceforge.net> Date: Wed, 21 Sep 2016 09:26:48 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <5bcff2ec-f3bd-ab9c-e13d-3a4f5cf7c73b@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:Kcqm4igK4dQXczfePXfdlZh4og5gihzkNP48h3L0GgqCCMi39mZ ZJcx1ifxY0Z148N7fPhDeGGjMtX1iXfT6rARTpTfucWbQkxj9dH0WBQEpQ+kBk0/MHY6SPT rTLL3w4TkBY9TSQ3+T5F9VwRU3QYWv4iLqDLjT9p6av1KIkBPE6fY7pLu67tJiNYzU6DVbv D0HboMd+qfaPRVni58V6g== X-UI-Out-Filterresults: notjunk:1;V01:K0:2Qb+uA2MDao=:65MiPOxAhWmbEf9zdnoZ9B yvAdM5tBw/+3V9eZDqKXaHODaawgx4QHY7MMkTuICs4e/0loVkrkINvLvlfjdHjlfDKDlQNk8 rdY13kQD3dd4uIXIq4IFcRextCmScS/AkRlOBzkmDbVdBQMtVZYhYUpUeNLHvHGPywEIC3dpz 2kc5kTZ6ds4ucYYlClKrwPzx9LWkGCxzw2BoXTk7g1ED2Mi+fUpPZyLIr2s0zVTAUtKYNytcU JKsHwrNpMPCWG5sjr8F4RF7BlR3OmY72s88klGnAPqSuQPsR2Lyk5Xawz8fb0RYf1jhYIoeMo kFrzhPdzUt3aOfVw6LSSl1zF3zNrGavd5GrbQ48M4qJRgOdE1WLoWgdvWLiMsDWDyRix11IcH mAaSs1VnkilAgLP9UoX1LDYtyDQnUx0cnEs0m/oKFTb2zbLx4T0xTgeSxvksUaSvoHxbZcoma mC2E9CUH2ZrGVKV6ccS7xuqrkjQ5GT5iKhZL9fwaWpzweOZp9BXW2WT01u4D50TmdtG7P8dV6 Vr1HjINNj3/qQGE1raghdYqSHw53WwUkRtVGOCzIHAIi/diTce19ws1rQUHL0ZVQD5BAenCiS qSueMsoPJRTDC5UqmqprAHosKZgOLjgKVx0gmqiZckO5WPkhJAJ8hMmtT8R1bMWUlK+7kjt7F niZrJHMLFbyDef70qoX/ulpQwMhVVQvfXlk2NDnWryVQ68jbnM1peRp9+xnzbRP0ssabGgFdL i/fOOFnfrkI445mHLE0aWJzk9MODAnwcaao8PICEr8zyzZTKxnXCglRhJ9WnDe5qry4o2BAKo QVcXqJe Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 21 Sep 2016 08:28:08 +0200 Do not use curly brackets at four source code places where a single statement should be sufficient. Signed-off-by: Markus Elfring --- drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c index dbaf577..cb50539 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgt215.c @@ -127,12 +127,11 @@ gt215_link_train_calc(u32 *vals, struct gt215_ltrain *train) } /* Find the best value for 0x1111e0 */ - for (i = 0; i < 4; i++) { + for (i = 0; i < 4; i++) if (bins[i] > qty) { bin = i + 3; qty = bins[i]; } - } train->r_100720 = 0; for (i = 0; i < 8; i++) { @@ -729,9 +728,8 @@ gt215_ram_calc(struct nvkm_ram *base, u32 freq) ram_mask(fuc, 0x1007e0, 0x22222222, r100760); } - if (device->chipset == 0xa3 && freq > 500000) { + if (device->chipset == 0xa3 && freq > 500000) ram_mask(fuc, 0x100700, 0x00000006, 0x00000000); - } /* Final switch */ if (mclk.pll) { @@ -745,12 +743,11 @@ gt215_ram_calc(struct nvkm_ram *base, u32 freq) ram_nsec(fuc, 2000); /* Set RAM MR parameters and timings */ - for (i = 2; i >= 0; i--) { + for (i = 2; i >= 0; i--) if (ram_rd32(fuc, mr[i]) != ram->base.mr[i]) { ram_wr32(fuc, mr[i], ram->base.mr[i]); ram_nsec(fuc, 1000); } - } ram_wr32(fuc, 0x100220[3], timing[3]); ram_wr32(fuc, 0x100220[1], timing[1]); @@ -838,11 +835,10 @@ gt215_ram_calc(struct nvkm_ram *base, u32 freq) if (!next->bios.ramcfg_DLLoff) nvkm_sddr2_dll_reset(fuc); - if (ram->base.type == NVKM_RAM_TYPE_GDDR3) { + if (ram->base.type == NVKM_RAM_TYPE_GDDR3) ram_nsec(fuc, 31000); - } else { + else ram_nsec(fuc, 14000); - } if (ram->base.type == NVKM_RAM_TYPE_DDR3) { ram_wr32(fuc, 0x100264, 0x1); -- 2.10.0