From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752461AbdGRVF6 (ORCPT ); Tue, 18 Jul 2017 17:05:58 -0400 Received: from anholt.net ([50.246.234.109]:50536 "EHLO anholt.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752171AbdGRVFR (ORCPT ); Tue, 18 Jul 2017 17:05:17 -0400 From: Eric Anholt To: dri-devel@lists.freedesktop.org, Archit Taneja , Andrzej Hajda , Laurent Pinchart , Thierry Reding Cc: linux-kernel@vger.kernel.org, Eric Anholt Subject: [PATCH v5 2/6] drm/bridge: Add a devm_ allocator for panel bridge. Date: Tue, 18 Jul 2017 14:05:06 -0700 Message-Id: <20170718210510.12229-2-eric@anholt.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170718210510.12229-1-eric@anholt.net> References: <20170718210510.12229-1-eric@anholt.net> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This will let drivers reduce the error cleanup they need, in particular the "is_panel_bridge" flag. v2: Slight cleanup of remove function by Andrzej Signed-off-by: Eric Anholt Reviewed-by: Andrzej Hajda --- drivers/gpu/drm/bridge/panel.c | 30 ++++++++++++++++++++++++++++++ include/drm/drm_bridge.h | 3 +++ 2 files changed, 33 insertions(+) diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c index 685c1a480201..292ee92a9c97 100644 --- a/drivers/gpu/drm/bridge/panel.c +++ b/drivers/gpu/drm/bridge/panel.c @@ -195,3 +195,33 @@ void drm_panel_bridge_remove(struct drm_bridge *bridge) devm_kfree(panel_bridge->panel->dev, bridge); } EXPORT_SYMBOL(drm_panel_bridge_remove); + +static void devm_drm_panel_bridge_release(struct device *dev, void *res) +{ + struct drm_bridge **bridge = res; + + drm_panel_bridge_remove(*bridge); +} + +struct drm_bridge *devm_drm_panel_bridge_add(struct device *dev, + struct drm_panel *panel, + u32 connector_type) +{ + struct drm_bridge **ptr, *bridge; + + ptr = devres_alloc(devm_drm_panel_bridge_release, sizeof(*ptr), + GFP_KERNEL); + if (!ptr) + return ERR_PTR(-ENOMEM); + + bridge = drm_panel_bridge_add(panel, connector_type); + if (!IS_ERR(bridge)) { + *ptr = bridge; + devres_add(dev, ptr); + } else { + devres_free(ptr); + } + + return bridge; +} +EXPORT_SYMBOL(devm_drm_panel_bridge_add); diff --git a/include/drm/drm_bridge.h b/include/drm/drm_bridge.h index 1dc94d5392e2..6522d4cbc9d9 100644 --- a/include/drm/drm_bridge.h +++ b/include/drm/drm_bridge.h @@ -268,6 +268,9 @@ void drm_bridge_enable(struct drm_bridge *bridge); struct drm_bridge *drm_panel_bridge_add(struct drm_panel *panel, u32 connector_type); void drm_panel_bridge_remove(struct drm_bridge *bridge); +struct drm_bridge *devm_drm_panel_bridge_add(struct device *dev, + struct drm_panel *panel, + u32 connector_type); #endif #endif -- 2.11.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Anholt Subject: [PATCH v5 2/6] drm/bridge: Add a devm_ allocator for panel bridge. Date: Tue, 18 Jul 2017 14:05:06 -0700 Message-ID: <20170718210510.12229-2-eric@anholt.net> References: <20170718210510.12229-1-eric@anholt.net> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from anholt.net (anholt.net [50.246.234.109]) by gabe.freedesktop.org (Postfix) with ESMTP id 3EC6D6E3BD for ; Tue, 18 Jul 2017 21:05:17 +0000 (UTC) In-Reply-To: <20170718210510.12229-1-eric@anholt.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, Archit Taneja , Andrzej Hajda , Laurent Pinchart , Thierry Reding Cc: linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org VGhpcyB3aWxsIGxldCBkcml2ZXJzIHJlZHVjZSB0aGUgZXJyb3IgY2xlYW51cCB0aGV5IG5lZWQs IGluCnBhcnRpY3VsYXIgdGhlICJpc19wYW5lbF9icmlkZ2UiIGZsYWcuCgp2MjogU2xpZ2h0IGNs ZWFudXAgb2YgcmVtb3ZlIGZ1bmN0aW9uIGJ5IEFuZHJ6ZWoKClNpZ25lZC1vZmYtYnk6IEVyaWMg QW5ob2x0IDxlcmljQGFuaG9sdC5uZXQ+ClJldmlld2VkLWJ5OiBBbmRyemVqIEhhamRhIDxhLmhh amRhQHNhbXN1bmcuY29tPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9icmlkZ2UvcGFuZWwuYyB8IDMw ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogaW5jbHVkZS9kcm0vZHJtX2JyaWRnZS5o ICAgICAgIHwgIDMgKysrCiAyIGZpbGVzIGNoYW5nZWQsIDMzIGluc2VydGlvbnMoKykKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYnJpZGdlL3BhbmVsLmMgYi9kcml2ZXJzL2dwdS9kcm0v YnJpZGdlL3BhbmVsLmMKaW5kZXggNjg1YzFhNDgwMjAxLi4yOTJlZTkyYTljOTcgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvZ3B1L2RybS9icmlkZ2UvcGFuZWwuYworKysgYi9kcml2ZXJzL2dwdS9kcm0v YnJpZGdlL3BhbmVsLmMKQEAgLTE5NSwzICsxOTUsMzMgQEAgdm9pZCBkcm1fcGFuZWxfYnJpZGdl X3JlbW92ZShzdHJ1Y3QgZHJtX2JyaWRnZSAqYnJpZGdlKQogCWRldm1fa2ZyZWUocGFuZWxfYnJp ZGdlLT5wYW5lbC0+ZGV2LCBicmlkZ2UpOwogfQogRVhQT1JUX1NZTUJPTChkcm1fcGFuZWxfYnJp ZGdlX3JlbW92ZSk7CisKK3N0YXRpYyB2b2lkIGRldm1fZHJtX3BhbmVsX2JyaWRnZV9yZWxlYXNl KHN0cnVjdCBkZXZpY2UgKmRldiwgdm9pZCAqcmVzKQoreworCXN0cnVjdCBkcm1fYnJpZGdlICoq YnJpZGdlID0gcmVzOworCisJZHJtX3BhbmVsX2JyaWRnZV9yZW1vdmUoKmJyaWRnZSk7Cit9CisK K3N0cnVjdCBkcm1fYnJpZGdlICpkZXZtX2RybV9wYW5lbF9icmlkZ2VfYWRkKHN0cnVjdCBkZXZp Y2UgKmRldiwKKwkJCQkJICAgICBzdHJ1Y3QgZHJtX3BhbmVsICpwYW5lbCwKKwkJCQkJICAgICB1 MzIgY29ubmVjdG9yX3R5cGUpCit7CisJc3RydWN0IGRybV9icmlkZ2UgKipwdHIsICpicmlkZ2U7 CisKKwlwdHIgPSBkZXZyZXNfYWxsb2MoZGV2bV9kcm1fcGFuZWxfYnJpZGdlX3JlbGVhc2UsIHNp emVvZigqcHRyKSwKKwkJCSAgIEdGUF9LRVJORUwpOworCWlmICghcHRyKQorCQlyZXR1cm4gRVJS X1BUUigtRU5PTUVNKTsKKworCWJyaWRnZSA9IGRybV9wYW5lbF9icmlkZ2VfYWRkKHBhbmVsLCBj b25uZWN0b3JfdHlwZSk7CisJaWYgKCFJU19FUlIoYnJpZGdlKSkgeworCQkqcHRyID0gYnJpZGdl OworCQlkZXZyZXNfYWRkKGRldiwgcHRyKTsKKwl9IGVsc2UgeworCQlkZXZyZXNfZnJlZShwdHIp OworCX0KKworCXJldHVybiBicmlkZ2U7Cit9CitFWFBPUlRfU1lNQk9MKGRldm1fZHJtX3BhbmVs X2JyaWRnZV9hZGQpOwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9kcm0vZHJtX2JyaWRnZS5oIGIvaW5j bHVkZS9kcm0vZHJtX2JyaWRnZS5oCmluZGV4IDFkYzk0ZDUzOTJlMi4uNjUyMmQ0Y2JjOWQ5IDEw MDY0NAotLS0gYS9pbmNsdWRlL2RybS9kcm1fYnJpZGdlLmgKKysrIGIvaW5jbHVkZS9kcm0vZHJt X2JyaWRnZS5oCkBAIC0yNjgsNiArMjY4LDkgQEAgdm9pZCBkcm1fYnJpZGdlX2VuYWJsZShzdHJ1 Y3QgZHJtX2JyaWRnZSAqYnJpZGdlKTsKIHN0cnVjdCBkcm1fYnJpZGdlICpkcm1fcGFuZWxfYnJp ZGdlX2FkZChzdHJ1Y3QgZHJtX3BhbmVsICpwYW5lbCwKIAkJCQkJdTMyIGNvbm5lY3Rvcl90eXBl KTsKIHZvaWQgZHJtX3BhbmVsX2JyaWRnZV9yZW1vdmUoc3RydWN0IGRybV9icmlkZ2UgKmJyaWRn ZSk7CitzdHJ1Y3QgZHJtX2JyaWRnZSAqZGV2bV9kcm1fcGFuZWxfYnJpZGdlX2FkZChzdHJ1Y3Qg ZGV2aWNlICpkZXYsCisJCQkJCSAgICAgc3RydWN0IGRybV9wYW5lbCAqcGFuZWwsCisJCQkJCSAg ICAgdTMyIGNvbm5lY3Rvcl90eXBlKTsKICNlbmRpZgogCiAjZW5kaWYKLS0gCjIuMTEuMAoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1h aWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==