From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Wed, 01 Nov 2017 15:39:54 +0000 Subject: [PATCH v2 1/2] drm/rcar-du: Use common error handling code in rcar_du_encoders_init() Message-Id: <56554dfd-6990-e104-ea70-e457f250fe5d@users.sourceforge.net> List-Id: References: <201710262044.165nsaJp%fengguang.wu@intel.com> <26b811dd-9dfa-cfd3-7d4d-e7f1c852b8ed@users.sourceforge.net> In-Reply-To: <26b811dd-9dfa-cfd3-7d4d-e7f1c852b8ed@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: kbuild test robot , dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, Dan Carpenter , David Airlie , Jani Nikula , Laurent Pinchart Cc: Geert Uytterhoeven , kernel-janitors@vger.kernel.org, LKML , kbuild-all@01.org From: Markus Elfring Date: Wed, 1 Nov 2017 15:57:31 +0100 * Add a jump target so that a bit of exception handling can be better reused at the end of this function. * Increase the scope for the variable "ret". This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- v2: The declaration for the variable "ret" was moved out of a loop. drivers/gpu/drm/rcar-du/rcar_du_kms.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c index 566d1a948c8f..b6b341164aab 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c @@ -365,6 +365,7 @@ static int rcar_du_encoders_init(struct rcar_du_device *rcdu) struct device_node *np = rcdu->dev->of_node; struct device_node *ep_node; unsigned int num_encoders = 0; + int ret; /* * Iterate over the endpoints and create one encoder for each output @@ -374,13 +375,10 @@ static int rcar_du_encoders_init(struct rcar_du_device *rcdu) enum rcar_du_output output; struct of_endpoint ep; unsigned int i; - int ret; ret = of_graph_parse_endpoint(ep_node, &ep); - if (ret < 0) { - of_node_put(ep_node); - return ret; - } + if (ret < 0) + goto put_node; /* Find the output route corresponding to the port number. */ for (i = 0; i < RCAR_DU_OUTPUT_MAX; ++i) { @@ -401,10 +399,8 @@ static int rcar_du_encoders_init(struct rcar_du_device *rcdu) /* Process the output pipeline. */ ret = rcar_du_encoders_init_one(rcdu, output, &ep); if (ret < 0) { - if (ret = -EPROBE_DEFER) { - of_node_put(ep_node); - return ret; - } + if (ret = -EPROBE_DEFER) + goto put_node; continue; } @@ -413,6 +409,10 @@ static int rcar_du_encoders_init(struct rcar_du_device *rcdu) } return num_encoders; + +put_node: + of_node_put(ep_node); + return ret; } static int rcar_du_properties_init(struct rcar_du_device *rcdu) -- 2.14.3 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.web.de ([212.227.15.14]:61920 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754692AbdKAPkR (ORCPT ); Wed, 1 Nov 2017 11:40:17 -0400 Subject: [PATCH v2 1/2] drm/rcar-du: Use common error handling code in rcar_du_encoders_init() From: SF Markus Elfring To: kbuild test robot , dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, Dan Carpenter , David Airlie , Jani Nikula , Laurent Pinchart Cc: kernel-janitors@vger.kernel.org, LKML , kbuild-all@01.org, Geert Uytterhoeven References: <201710262044.165nsaJp%fengguang.wu@intel.com> <26b811dd-9dfa-cfd3-7d4d-e7f1c852b8ed@users.sourceforge.net> Message-ID: <56554dfd-6990-e104-ea70-e457f250fe5d@users.sourceforge.net> Date: Wed, 1 Nov 2017 16:39:54 +0100 MIME-Version: 1.0 In-Reply-To: <26b811dd-9dfa-cfd3-7d4d-e7f1c852b8ed@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Language: en-GB Content-Transfer-Encoding: 8bit Sender: linux-renesas-soc-owner@vger.kernel.org List-ID: From: Markus Elfring Date: Wed, 1 Nov 2017 15:57:31 +0100 * Add a jump target so that a bit of exception handling can be better reused at the end of this function. * Increase the scope for the variable "ret". This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- v2: The declaration for the variable "ret" was moved out of a loop. drivers/gpu/drm/rcar-du/rcar_du_kms.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c index 566d1a948c8f..b6b341164aab 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c @@ -365,6 +365,7 @@ static int rcar_du_encoders_init(struct rcar_du_device *rcdu) struct device_node *np = rcdu->dev->of_node; struct device_node *ep_node; unsigned int num_encoders = 0; + int ret; /* * Iterate over the endpoints and create one encoder for each output @@ -374,13 +375,10 @@ static int rcar_du_encoders_init(struct rcar_du_device *rcdu) enum rcar_du_output output; struct of_endpoint ep; unsigned int i; - int ret; ret = of_graph_parse_endpoint(ep_node, &ep); - if (ret < 0) { - of_node_put(ep_node); - return ret; - } + if (ret < 0) + goto put_node; /* Find the output route corresponding to the port number. */ for (i = 0; i < RCAR_DU_OUTPUT_MAX; ++i) { @@ -401,10 +399,8 @@ static int rcar_du_encoders_init(struct rcar_du_device *rcdu) /* Process the output pipeline. */ ret = rcar_du_encoders_init_one(rcdu, output, &ep); if (ret < 0) { - if (ret == -EPROBE_DEFER) { - of_node_put(ep_node); - return ret; - } + if (ret == -EPROBE_DEFER) + goto put_node; continue; } @@ -413,6 +409,10 @@ static int rcar_du_encoders_init(struct rcar_du_device *rcdu) } return num_encoders; + +put_node: + of_node_put(ep_node); + return ret; } static int rcar_du_properties_init(struct rcar_du_device *rcdu) -- 2.14.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Subject: [PATCH v2 1/2] drm/rcar-du: Use common error handling code in rcar_du_encoders_init() Date: Wed, 1 Nov 2017 16:39:54 +0100 Message-ID: <56554dfd-6990-e104-ea70-e457f250fe5d@users.sourceforge.net> References: <201710262044.165nsaJp%fengguang.wu@intel.com> <26b811dd-9dfa-cfd3-7d4d-e7f1c852b8ed@users.sourceforge.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mout.web.de (mout.web.de [212.227.15.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id 960436E79E for ; Wed, 1 Nov 2017 15:40:14 +0000 (UTC) In-Reply-To: <26b811dd-9dfa-cfd3-7d4d-e7f1c852b8ed@users.sourceforge.net> Content-Language: en-GB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: kbuild test robot , dri-devel@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, Dan Carpenter , David Airlie , Jani Nikula , Laurent Pinchart Cc: Geert Uytterhoeven , kernel-janitors@vger.kernel.org, LKML , kbuild-all@01.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogTWFya3VzIEVsZnJpbmcgPGVsZnJpbmdAdXNlcnMuc291cmNlZm9yZ2UubmV0PgpEYXRl OiBXZWQsIDEgTm92IDIwMTcgMTU6NTc6MzEgKzAxMDAKCiogQWRkIGEganVtcCB0YXJnZXQgc28g dGhhdCBhIGJpdCBvZiBleGNlcHRpb24gaGFuZGxpbmcgY2FuIGJlIGJldHRlcgogIHJldXNlZCBh dCB0aGUgZW5kIG9mIHRoaXMgZnVuY3Rpb24uCgoqIEluY3JlYXNlIHRoZSBzY29wZSBmb3IgdGhl IHZhcmlhYmxlICJyZXQiLgoKVGhpcyBpc3N1ZSB3YXMgZGV0ZWN0ZWQgYnkgdXNpbmcgdGhlIENv Y2NpbmVsbGUgc29mdHdhcmUuCgpTaWduZWQtb2ZmLWJ5OiBNYXJrdXMgRWxmcmluZyA8ZWxmcmlu Z0B1c2Vycy5zb3VyY2Vmb3JnZS5uZXQ+Ci0tLQoKdjI6ClRoZSBkZWNsYXJhdGlvbiBmb3IgdGhl IHZhcmlhYmxlICJyZXQiIHdhcyBtb3ZlZCBvdXQgb2YgYSBsb29wLgoKIGRyaXZlcnMvZ3B1L2Ry bS9yY2FyLWR1L3JjYXJfZHVfa21zLmMgfCAxOCArKysrKysrKystLS0tLS0tLS0KIDEgZmlsZSBj aGFuZ2VkLCA5IGluc2VydGlvbnMoKyksIDkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJp dmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9rbXMuYyBiL2RyaXZlcnMvZ3B1L2RybS9yY2Fy LWR1L3JjYXJfZHVfa21zLmMKaW5kZXggNTY2ZDFhOTQ4YzhmLi5iNmIzNDExNjRhYWIgMTAwNjQ0 Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfa21zLmMKKysrIGIvZHJpdmVy cy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9rbXMuYwpAQCAtMzY1LDYgKzM2NSw3IEBAIHN0YXRp YyBpbnQgcmNhcl9kdV9lbmNvZGVyc19pbml0KHN0cnVjdCByY2FyX2R1X2RldmljZSAqcmNkdSkK IAlzdHJ1Y3QgZGV2aWNlX25vZGUgKm5wID0gcmNkdS0+ZGV2LT5vZl9ub2RlOwogCXN0cnVjdCBk ZXZpY2Vfbm9kZSAqZXBfbm9kZTsKIAl1bnNpZ25lZCBpbnQgbnVtX2VuY29kZXJzID0gMDsKKwlp bnQgcmV0OwogCiAJLyoKIAkgKiBJdGVyYXRlIG92ZXIgdGhlIGVuZHBvaW50cyBhbmQgY3JlYXRl IG9uZSBlbmNvZGVyIGZvciBlYWNoIG91dHB1dApAQCAtMzc0LDEzICszNzUsMTAgQEAgc3RhdGlj IGludCByY2FyX2R1X2VuY29kZXJzX2luaXQoc3RydWN0IHJjYXJfZHVfZGV2aWNlICpyY2R1KQog CQllbnVtIHJjYXJfZHVfb3V0cHV0IG91dHB1dDsKIAkJc3RydWN0IG9mX2VuZHBvaW50IGVwOwog CQl1bnNpZ25lZCBpbnQgaTsKLQkJaW50IHJldDsKIAogCQlyZXQgPSBvZl9ncmFwaF9wYXJzZV9l bmRwb2ludChlcF9ub2RlLCAmZXApOwotCQlpZiAocmV0IDwgMCkgewotCQkJb2Zfbm9kZV9wdXQo ZXBfbm9kZSk7Ci0JCQlyZXR1cm4gcmV0OwotCQl9CisJCWlmIChyZXQgPCAwKQorCQkJZ290byBw dXRfbm9kZTsKIAogCQkvKiBGaW5kIHRoZSBvdXRwdXQgcm91dGUgY29ycmVzcG9uZGluZyB0byB0 aGUgcG9ydCBudW1iZXIuICovCiAJCWZvciAoaSA9IDA7IGkgPCBSQ0FSX0RVX09VVFBVVF9NQVg7 ICsraSkgewpAQCAtNDAxLDEwICszOTksOCBAQCBzdGF0aWMgaW50IHJjYXJfZHVfZW5jb2RlcnNf aW5pdChzdHJ1Y3QgcmNhcl9kdV9kZXZpY2UgKnJjZHUpCiAJCS8qIFByb2Nlc3MgdGhlIG91dHB1 dCBwaXBlbGluZS4gKi8KIAkJcmV0ID0gcmNhcl9kdV9lbmNvZGVyc19pbml0X29uZShyY2R1LCBv dXRwdXQsICZlcCk7CiAJCWlmIChyZXQgPCAwKSB7Ci0JCQlpZiAocmV0ID09IC1FUFJPQkVfREVG RVIpIHsKLQkJCQlvZl9ub2RlX3B1dChlcF9ub2RlKTsKLQkJCQlyZXR1cm4gcmV0OwotCQkJfQor CQkJaWYgKHJldCA9PSAtRVBST0JFX0RFRkVSKQorCQkJCWdvdG8gcHV0X25vZGU7CiAKIAkJCWNv bnRpbnVlOwogCQl9CkBAIC00MTMsNiArNDA5LDEwIEBAIHN0YXRpYyBpbnQgcmNhcl9kdV9lbmNv ZGVyc19pbml0KHN0cnVjdCByY2FyX2R1X2RldmljZSAqcmNkdSkKIAl9CiAKIAlyZXR1cm4gbnVt X2VuY29kZXJzOworCitwdXRfbm9kZToKKwlvZl9ub2RlX3B1dChlcF9ub2RlKTsKKwlyZXR1cm4g cmV0OwogfQogCiBzdGF0aWMgaW50IHJjYXJfZHVfcHJvcGVydGllc19pbml0KHN0cnVjdCByY2Fy X2R1X2RldmljZSAqcmNkdSkKLS0gCjIuMTQuMwoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vZHJpLWRldmVsCg==