From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Mon, 17 Dec 2018 07:03:44 +0000 Subject: [PATCH] drm/ati_pcigart: Fix error code in drm_ati_pcigart_init() Message-Id: <20181217070344.GC12159@kadam> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Maarten Lankhorst Cc: Maxime Ripard , kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org, David Airlie , Sean Paul The drm_ati_pcigart_init() function was originally suppose to return one on success and zero on failure, but these days it returns a mix of zero, one and -ENOMEM on failure. This patch cleans it up and modifies the caller so now the function returns zero on success and negative error codes on failure. Signed-off-by: Dan Carpenter --- drivers/gpu/drm/ati_pcigart.c | 7 ++++--- drivers/gpu/drm/r128/r128_cce.c | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/ati_pcigart.c b/drivers/gpu/drm/ati_pcigart.c index 6c4d4b6eba80..2362f07fe1fc 100644 --- a/drivers/gpu/drm/ati_pcigart.c +++ b/drivers/gpu/drm/ati_pcigart.c @@ -103,7 +103,7 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga unsigned long pages; u32 *pci_gart = NULL, page_base, gart_idx; dma_addr_t bus_address = 0; - int i, j, ret = 0; + int i, j, ret = -ENOMEM; int max_ati_pages, max_real_pages; if (!entry) { @@ -117,7 +117,7 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga if (pci_set_dma_mask(dev->pdev, gart_info->table_mask)) { DRM_ERROR("fail to set dma mask to 0x%Lx\n", (unsigned long long)gart_info->table_mask); - ret = 1; + ret = -EFAULT; goto done; } @@ -160,6 +160,7 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga drm_ati_pcigart_cleanup(dev, gart_info); address = NULL; bus_address = 0; + ret = -ENOMEM; goto done; } page_base = (u32) entry->busaddr[i]; @@ -188,7 +189,7 @@ int drm_ati_pcigart_init(struct drm_device *dev, struct drm_ati_pcigart_info *ga page_base += ATI_PCIGART_PAGE_SIZE; } } - ret = 1; + ret = 0; #if defined(__i386__) || defined(__x86_64__) wbinvd(); diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c index c9890afe69d6..b91af1bf531b 100644 --- a/drivers/gpu/drm/r128/r128_cce.c +++ b/drivers/gpu/drm/r128/r128_cce.c @@ -560,11 +560,12 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init) dev_priv->gart_info.addr = NULL; dev_priv->gart_info.bus_addr = 0; dev_priv->gart_info.gart_reg_if = DRM_ATI_GART_PCI; - if (!drm_ati_pcigart_init(dev, &dev_priv->gart_info)) { + rc = drm_ati_pcigart_init(dev, &dev_priv->gart_info); + if (rc) { DRM_ERROR("failed to init PCI GART!\n"); dev->dev_private = (void *)dev_priv; r128_do_cleanup_cce(dev); - return -ENOMEM; + return rc; } R128_WRITE(R128_PCI_GART_PAGE, dev_priv->gart_info.bus_addr); #if IS_ENABLED(CONFIG_AGP) -- 2.17.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [PATCH] drm/ati_pcigart: Fix error code in drm_ati_pcigart_init() Date: Mon, 17 Dec 2018 10:03:44 +0300 Message-ID: <20181217070344.GC12159@kadam> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from userp2120.oracle.com (userp2120.oracle.com [156.151.31.85]) by gabe.freedesktop.org (Postfix) with ESMTPS id D7DE26E284 for ; Mon, 17 Dec 2018 07:05:00 +0000 (UTC) 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: Maarten Lankhorst Cc: Maxime Ripard , kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org, David Airlie , Sean Paul List-Id: dri-devel@lists.freedesktop.org VGhlIGRybV9hdGlfcGNpZ2FydF9pbml0KCkgZnVuY3Rpb24gd2FzIG9yaWdpbmFsbHkgc3VwcG9z ZSB0byByZXR1cm4gb25lCm9uIHN1Y2Nlc3MgYW5kIHplcm8gb24gZmFpbHVyZSwgYnV0IHRoZXNl IGRheXMgaXQgcmV0dXJucyBhIG1peCBvZgp6ZXJvLCBvbmUgYW5kIC1FTk9NRU0gb24gZmFpbHVy ZS4KClRoaXMgcGF0Y2ggY2xlYW5zIGl0IHVwIGFuZCBtb2RpZmllcyB0aGUgY2FsbGVyIHNvIG5v dyB0aGUgZnVuY3Rpb24KcmV0dXJucyB6ZXJvIG9uIHN1Y2Nlc3MgYW5kIG5lZ2F0aXZlIGVycm9y IGNvZGVzIG9uIGZhaWx1cmUuCgpTaWduZWQtb2ZmLWJ5OiBEYW4gQ2FycGVudGVyIDxkYW4uY2Fy cGVudGVyQG9yYWNsZS5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL2F0aV9wY2lnYXJ0LmMgICB8 IDcgKysrKy0tLQogZHJpdmVycy9ncHUvZHJtL3IxMjgvcjEyOF9jY2UuYyB8IDUgKysrLS0KIDIg ZmlsZXMgY2hhbmdlZCwgNyBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL2RyaXZlcnMvZ3B1L2RybS9hdGlfcGNpZ2FydC5jIGIvZHJpdmVycy9ncHUvZHJtL2F0aV9w Y2lnYXJ0LmMKaW5kZXggNmM0ZDRiNmViYTgwLi4yMzYyZjA3ZmUxZmMgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9hdGlfcGNpZ2FydC5jCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9hdGlfcGNp Z2FydC5jCkBAIC0xMDMsNyArMTAzLDcgQEAgaW50IGRybV9hdGlfcGNpZ2FydF9pbml0KHN0cnVj dCBkcm1fZGV2aWNlICpkZXYsIHN0cnVjdCBkcm1fYXRpX3BjaWdhcnRfaW5mbyAqZ2EKIAl1bnNp Z25lZCBsb25nIHBhZ2VzOwogCXUzMiAqcGNpX2dhcnQgPSBOVUxMLCBwYWdlX2Jhc2UsIGdhcnRf aWR4OwogCWRtYV9hZGRyX3QgYnVzX2FkZHJlc3MgPSAwOwotCWludCBpLCBqLCByZXQgPSAwOwor CWludCBpLCBqLCByZXQgPSAtRU5PTUVNOwogCWludCBtYXhfYXRpX3BhZ2VzLCBtYXhfcmVhbF9w YWdlczsKIAogCWlmICghZW50cnkpIHsKQEAgLTExNyw3ICsxMTcsNyBAQCBpbnQgZHJtX2F0aV9w Y2lnYXJ0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRybV9hdGlfcGNpZ2Fy dF9pbmZvICpnYQogCQlpZiAocGNpX3NldF9kbWFfbWFzayhkZXYtPnBkZXYsIGdhcnRfaW5mby0+ dGFibGVfbWFzaykpIHsKIAkJCURSTV9FUlJPUigiZmFpbCB0byBzZXQgZG1hIG1hc2sgdG8gMHgl THhcbiIsCiAJCQkJICAodW5zaWduZWQgbG9uZyBsb25nKWdhcnRfaW5mby0+dGFibGVfbWFzayk7 Ci0JCQlyZXQgPSAxOworCQkJcmV0ID0gLUVGQVVMVDsKIAkJCWdvdG8gZG9uZTsKIAkJfQogCkBA IC0xNjAsNiArMTYwLDcgQEAgaW50IGRybV9hdGlfcGNpZ2FydF9pbml0KHN0cnVjdCBkcm1fZGV2 aWNlICpkZXYsIHN0cnVjdCBkcm1fYXRpX3BjaWdhcnRfaW5mbyAqZ2EKIAkJCWRybV9hdGlfcGNp Z2FydF9jbGVhbnVwKGRldiwgZ2FydF9pbmZvKTsKIAkJCWFkZHJlc3MgPSBOVUxMOwogCQkJYnVz X2FkZHJlc3MgPSAwOworCQkJcmV0ID0gLUVOT01FTTsKIAkJCWdvdG8gZG9uZTsKIAkJfQogCQlw YWdlX2Jhc2UgPSAodTMyKSBlbnRyeS0+YnVzYWRkcltpXTsKQEAgLTE4OCw3ICsxODksNyBAQCBp bnQgZHJtX2F0aV9wY2lnYXJ0X2luaXQoc3RydWN0IGRybV9kZXZpY2UgKmRldiwgc3RydWN0IGRy bV9hdGlfcGNpZ2FydF9pbmZvICpnYQogCQkJcGFnZV9iYXNlICs9IEFUSV9QQ0lHQVJUX1BBR0Vf U0laRTsKIAkJfQogCX0KLQlyZXQgPSAxOworCXJldCA9IDA7CiAKICNpZiBkZWZpbmVkKF9faTM4 Nl9fKSB8fCBkZWZpbmVkKF9feDg2XzY0X18pCiAJd2JpbnZkKCk7CmRpZmYgLS1naXQgYS9kcml2 ZXJzL2dwdS9kcm0vcjEyOC9yMTI4X2NjZS5jIGIvZHJpdmVycy9ncHUvZHJtL3IxMjgvcjEyOF9j Y2UuYwppbmRleCBjOTg5MGFmZTY5ZDYuLmI5MWFmMWJmNTMxYiAxMDA2NDQKLS0tIGEvZHJpdmVy cy9ncHUvZHJtL3IxMjgvcjEyOF9jY2UuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vcjEyOC9yMTI4 X2NjZS5jCkBAIC01NjAsMTEgKzU2MCwxMiBAQCBzdGF0aWMgaW50IHIxMjhfZG9faW5pdF9jY2Uo c3RydWN0IGRybV9kZXZpY2UgKmRldiwgZHJtX3IxMjhfaW5pdF90ICppbml0KQogCQlkZXZfcHJp di0+Z2FydF9pbmZvLmFkZHIgPSBOVUxMOwogCQlkZXZfcHJpdi0+Z2FydF9pbmZvLmJ1c19hZGRy ID0gMDsKIAkJZGV2X3ByaXYtPmdhcnRfaW5mby5nYXJ0X3JlZ19pZiA9IERSTV9BVElfR0FSVF9Q Q0k7Ci0JCWlmICghZHJtX2F0aV9wY2lnYXJ0X2luaXQoZGV2LCAmZGV2X3ByaXYtPmdhcnRfaW5m bykpIHsKKwkJcmMgPSBkcm1fYXRpX3BjaWdhcnRfaW5pdChkZXYsICZkZXZfcHJpdi0+Z2FydF9p bmZvKTsKKwkJaWYgKHJjKSB7CiAJCQlEUk1fRVJST1IoImZhaWxlZCB0byBpbml0IFBDSSBHQVJU IVxuIik7CiAJCQlkZXYtPmRldl9wcml2YXRlID0gKHZvaWQgKilkZXZfcHJpdjsKIAkJCXIxMjhf ZG9fY2xlYW51cF9jY2UoZGV2KTsKLQkJCXJldHVybiAtRU5PTUVNOworCQkJcmV0dXJuIHJjOwog CQl9CiAJCVIxMjhfV1JJVEUoUjEyOF9QQ0lfR0FSVF9QQUdFLCBkZXZfcHJpdi0+Z2FydF9pbmZv LmJ1c19hZGRyKTsKICNpZiBJU19FTkFCTEVEKENPTkZJR19BR1ApCi0tIAoyLjE3LjEKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBtYWls aW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=