From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Thu, 11 Jun 2015 08:19:24 +0000 Subject: [patch] drm/amdgpu: remove an unnecessary condition Message-Id: <20150611081924.GA27090@mwanda> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: David Airlie , Alex Deucher Cc: Marek =?utf-8?B?T2zFocOhaw==?= , kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org, yanyang1 , Ken Wang , Christian =?iso-8859-1?Q?K=F6nig?= We already checked "if (r)" so there is no need to check again. Signed-off-by: Dan Carpenter diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c index 5533434..b7d0425 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c @@ -111,12 +111,9 @@ int amdgpu_driver_load_kms(struct drm_device *dev, unsigned long flags) /* Call ACPI methods: require modeset init * but failure is not fatal */ - if (!r) { - acpi_status = amdgpu_acpi_init(adev); - if (acpi_status) - dev_dbg(&dev->pdev->dev, - "Error during ACPI methods call\n"); - } + acpi_status = amdgpu_acpi_init(adev); + if (acpi_status) + dev_dbg(&dev->pdev->dev, "Error during ACPI methods call\n"); if (amdgpu_device_is_px(dev)) { pm_runtime_use_autosuspend(dev->dev); From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [patch] drm/amdgpu: remove an unnecessary condition Date: Thu, 11 Jun 2015 11:19:24 +0300 Message-ID: <20150611081924.GA27090@mwanda> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) by gabe.freedesktop.org (Postfix) with ESMTP id 22E076E088 for ; Thu, 11 Jun 2015 01:19:47 -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 , Alex Deucher Cc: Marek =?utf-8?B?T2zFocOhaw==?= , kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org, yanyang1 , Ken Wang , Christian =?iso-8859-1?Q?K=F6nig?= List-Id: dri-devel@lists.freedesktop.org V2UgYWxyZWFkeSBjaGVja2VkICJpZiAocikiIHNvIHRoZXJlIGlzIG5vIG5lZWQgdG8gY2hlY2sg YWdhaW4uCgpTaWduZWQtb2ZmLWJ5OiBEYW4gQ2FycGVudGVyIDxkYW4uY2FycGVudGVyQG9yYWNs ZS5jb20+CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2tt cy5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2ttcy5jCmluZGV4IDU1MzM0 MzQuLmI3ZDA0MjUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdw dV9rbXMuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGdwdS9hbWRncHVfa21zLmMKQEAg LTExMSwxMiArMTExLDkgQEAgaW50IGFtZGdwdV9kcml2ZXJfbG9hZF9rbXMoc3RydWN0IGRybV9k ZXZpY2UgKmRldiwgdW5zaWduZWQgbG9uZyBmbGFncykKIAkvKiBDYWxsIEFDUEkgbWV0aG9kczog cmVxdWlyZSBtb2Rlc2V0IGluaXQKIAkgKiBidXQgZmFpbHVyZSBpcyBub3QgZmF0YWwKIAkgKi8K LQlpZiAoIXIpIHsKLQkJYWNwaV9zdGF0dXMgPSBhbWRncHVfYWNwaV9pbml0KGFkZXYpOwotCQlp ZiAoYWNwaV9zdGF0dXMpCi0JCWRldl9kYmcoJmRldi0+cGRldi0+ZGV2LAotCQkJCSJFcnJvciBk dXJpbmcgQUNQSSBtZXRob2RzIGNhbGxcbiIpOwotCX0KKwlhY3BpX3N0YXR1cyA9IGFtZGdwdV9h Y3BpX2luaXQoYWRldik7CisJaWYgKGFjcGlfc3RhdHVzKQorCQlkZXZfZGJnKCZkZXYtPnBkZXYt PmRldiwgIkVycm9yIGR1cmluZyBBQ1BJIG1ldGhvZHMgY2FsbFxuIik7CiAKIAlpZiAoYW1kZ3B1 X2RldmljZV9pc19weChkZXYpKSB7CiAJCXBtX3J1bnRpbWVfdXNlX2F1dG9zdXNwZW5kKGRldi0+ ZGV2KTsKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJp LWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6 Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK