From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Mon, 23 Mar 2015 09:37:12 +0000 Subject: [patch] drm/nouveau/fb: remove unneeded an condition Message-Id: <20150323093712.GD558@mwanda> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: David Airlie Cc: dri-devel@lists.freedesktop.org, kernel-janitors@vger.kernel.org, Ben Skeggs We checked "ver" and "ramcfg.size" before and they haven't changed so static checkers complain when we test them again here. "rammap.data" isn't be NULL so "ramcfg.data" is also not NULL so there is no need to check. Signed-off-by: Dan Carpenter diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c index de9f395..e465635 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c @@ -157,10 +157,6 @@ gf100_ram_calc(struct nvkm_fb *pfb, u32 freq) } ramcfg.data = rammap.data + rammap.size + (strap * ramcfg.size); - if (!ramcfg.data || ver != 0x10 || ramcfg.size < 0x0e) { - nv_error(pfb, "invalid/missing ramcfg entry\n"); - return -EINVAL; - } /* lookup memory timings, if bios says they're present */ strap = nv_ro08(bios, ramcfg.data + 0x01); From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [patch] drm/nouveau/fb: remove unneeded an condition Date: Mon, 23 Mar 2015 12:37:12 +0300 Message-ID: <20150323093712.GD558@mwanda> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from aserp1040.oracle.com (aserp1040.oracle.com [141.146.126.69]) by gabe.freedesktop.org (Postfix) with ESMTP id 1E27E6E543 for ; Mon, 23 Mar 2015 02:37:29 -0700 (PDT) Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: David Airlie Cc: dri-devel@lists.freedesktop.org, kernel-janitors@vger.kernel.org, Ben Skeggs List-Id: dri-devel@lists.freedesktop.org V2UgY2hlY2tlZCAidmVyIiBhbmQgInJhbWNmZy5zaXplIiBiZWZvcmUgYW5kIHRoZXkgaGF2ZW4n dCBjaGFuZ2VkIHNvCnN0YXRpYyBjaGVja2VycyBjb21wbGFpbiB3aGVuIHdlIHRlc3QgdGhlbSBh Z2FpbiBoZXJlLiAgInJhbW1hcC5kYXRhIgppc24ndCBiZSBOVUxMIHNvICJyYW1jZmcuZGF0YSIg aXMgYWxzbyBub3QgTlVMTCBzbyB0aGVyZSBpcyBubyBuZWVkIHRvCmNoZWNrLgoKU2lnbmVkLW9m Zi1ieTogRGFuIENhcnBlbnRlciA8ZGFuLmNhcnBlbnRlckBvcmFjbGUuY29tPgoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L252a20vc3ViZGV2L2ZiL3JhbWdmMTAwLmMgYi9k cml2ZXJzL2dwdS9kcm0vbm91dmVhdS9udmttL3N1YmRldi9mYi9yYW1nZjEwMC5jCmluZGV4IGRl OWYzOTUuLmU0NjU2MzUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9ub3V2ZWF1L252a20v c3ViZGV2L2ZiL3JhbWdmMTAwLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbnZrbS9z dWJkZXYvZmIvcmFtZ2YxMDAuYwpAQCAtMTU3LDEwICsxNTcsNiBAQCBnZjEwMF9yYW1fY2FsYyhz dHJ1Y3QgbnZrbV9mYiAqcGZiLCB1MzIgZnJlcSkKIAl9CiAKIAlyYW1jZmcuZGF0YSA9IHJhbW1h cC5kYXRhICsgcmFtbWFwLnNpemUgKyAoc3RyYXAgKiByYW1jZmcuc2l6ZSk7Ci0JaWYgKCFyYW1j ZmcuZGF0YSB8fCB2ZXIgIT0gMHgxMCB8fCByYW1jZmcuc2l6ZSA8IDB4MGUpIHsKLQkJbnZfZXJy b3IocGZiLCAiaW52YWxpZC9taXNzaW5nIHJhbWNmZyBlbnRyeVxuIik7Ci0JCXJldHVybiAtRUlO VkFMOwotCX0KIAogCS8qIGxvb2t1cCBtZW1vcnkgdGltaW5ncywgaWYgYmlvcyBzYXlzIHRoZXkn cmUgcHJlc2VudCAqLwogCXN0cmFwID0gbnZfcm8wOChiaW9zLCByYW1jZmcuZGF0YSArIDB4MDEp OwpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2 ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xp c3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=