From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 754A5C43613 for ; Mon, 24 Jun 2019 16:03:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5757D20449 for ; Mon, 24 Jun 2019 16:03:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731482AbfFXQDt (ORCPT ); Mon, 24 Jun 2019 12:03:49 -0400 Received: from lb3-smtp-cloud7.xs4all.net ([194.109.24.31]:53963 "EHLO lb3-smtp-cloud7.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729544AbfFXQDl (ORCPT ); Mon, 24 Jun 2019 12:03:41 -0400 Received: from tschai.fritz.box ([46.9.252.75]) by smtp-cloud7.xs4all.net with ESMTPA id fRRKhHRxHF85OfRRUhZacU; Mon, 24 Jun 2019 18:03:40 +0200 From: Hans Verkuil To: linux-media@vger.kernel.org Cc: Dariusz Marcinkiewicz , dri-devel@lists.freedesktop.org, Cheng-yi Chiang , Hans Verkuil Subject: [PATCHv8 11/13] tda9950: use cec_notifier_cec_adap_(un)register Date: Mon, 24 Jun 2019 18:03:28 +0200 Message-Id: <20190624160330.38048-12-hverkuil-cisco@xs4all.nl> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190624160330.38048-1-hverkuil-cisco@xs4all.nl> References: <20190624160330.38048-1-hverkuil-cisco@xs4all.nl> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CMAE-Envelope: MS4wfLCPjq3p+R9QmCMsQTA9+mAzDRYhjOa+m8A9tjGFSHr66DXTyLSWScP6ZRRakAuY3n1jtUBpistGpUqsNtruoUZ9e8cU4sBOfMndmqH66FkFW2ySDyiE 68+Fg/YTMGee6nAnnWgLG3+6iLNv7Cexc/GpLSveDrEvVQ3b3VP8ykGAFQ8odWnTlJ2GV/0f3bznsEPdwL1q5UbAI8NHErt1I8XDB8S6oW3Xj8q0Nv0YO+Zf ibvmPJeO5NQXFerOwOAAluZS3KKR4G4elgKjAx+0tARDCa9Q371SfLFoL4BEFPPNhQucA783XgHDls+J2a8k7qyXuSOGG6rUdMjcGHtaVYQ= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Dariusz Marcinkiewicz Use the new cec_notifier_cec_adap_(un)register() functions to (un)register the notifier for the CEC adapter. Signed-off-by: Dariusz Marcinkiewicz Signed-off-by: Hans Verkuil --- drivers/gpu/drm/i2c/tda9950.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/i2c/tda9950.c b/drivers/gpu/drm/i2c/tda9950.c index 250b5e02a314..2f3381f0b2bf 100644 --- a/drivers/gpu/drm/i2c/tda9950.c +++ b/drivers/gpu/drm/i2c/tda9950.c @@ -423,7 +423,7 @@ static int tda9950_probe(struct i2c_client *client, priv->hdmi = glue->parent; priv->adap = cec_allocate_adapter(&tda9950_cec_ops, priv, "tda9950", - CEC_CAP_DEFAULTS, + CEC_CAP_DEFAULTS | CEC_CAP_CONNECTOR_INFO, CEC_MAX_LOG_ADDRS); if (IS_ERR(priv->adap)) return PTR_ERR(priv->adap); @@ -460,13 +460,14 @@ static int tda9950_probe(struct i2c_client *client, if (ret < 0) return ret; - priv->notify = cec_notifier_get(priv->hdmi); + priv->notify = cec_notifier_cec_adap_register(priv->hdmi, NULL, + priv->adap); if (!priv->notify) return -ENOMEM; ret = cec_register_adapter(priv->adap, priv->hdmi); if (ret < 0) { - cec_notifier_put(priv->notify); + cec_notifier_cec_adap_unregister(priv->notify); return ret; } @@ -476,8 +477,6 @@ static int tda9950_probe(struct i2c_client *client, */ devm_remove_action(dev, tda9950_cec_del, priv); - cec_register_cec_notifier(priv->adap, priv->notify); - return 0; } @@ -485,8 +484,8 @@ static int tda9950_remove(struct i2c_client *client) { struct tda9950_priv *priv = i2c_get_clientdata(client); + cec_notifier_cec_adap_unregister(priv->notify); cec_unregister_adapter(priv->adap); - cec_notifier_put(priv->notify); return 0; } -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans Verkuil Subject: [PATCHv8 11/13] tda9950: use cec_notifier_cec_adap_(un)register Date: Mon, 24 Jun 2019 18:03:28 +0200 Message-ID: <20190624160330.38048-12-hverkuil-cisco@xs4all.nl> References: <20190624160330.38048-1-hverkuil-cisco@xs4all.nl> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from lb3-smtp-cloud7.xs4all.net (lb3-smtp-cloud7.xs4all.net [194.109.24.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5C09A89CCE for ; Mon, 24 Jun 2019 16:10:48 +0000 (UTC) In-Reply-To: <20190624160330.38048-1-hverkuil-cisco@xs4all.nl> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-media@vger.kernel.org Cc: Hans Verkuil , Dariusz Marcinkiewicz , dri-devel@lists.freedesktop.org, Cheng-yi Chiang List-Id: dri-devel@lists.freedesktop.org RnJvbTogRGFyaXVzeiBNYXJjaW5raWV3aWN6IDxkYXJla21AZ29vZ2xlLmNvbT4KClVzZSB0aGUg bmV3IGNlY19ub3RpZmllcl9jZWNfYWRhcF8odW4pcmVnaXN0ZXIoKSBmdW5jdGlvbnMgdG8KKHVu KXJlZ2lzdGVyIHRoZSBub3RpZmllciBmb3IgdGhlIENFQyBhZGFwdGVyLgoKU2lnbmVkLW9mZi1i eTogRGFyaXVzeiBNYXJjaW5raWV3aWN6IDxkYXJla21AZ29vZ2xlLmNvbT4KU2lnbmVkLW9mZi1i eTogSGFucyBWZXJrdWlsIDxodmVya3VpbC1jaXNjb0B4czRhbGwubmw+Ci0tLQogZHJpdmVycy9n cHUvZHJtL2kyYy90ZGE5OTUwLmMgfCAxMSArKysrKy0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDUg aW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vaTJjL3RkYTk5NTAuYyBiL2RyaXZlcnMvZ3B1L2RybS9pMmMvdGRhOTk1MC5jCmluZGV4IDI1 MGI1ZTAyYTMxNC4uMmYzMzgxZjBiMmJmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vaTJj L3RkYTk5NTAuYworKysgYi9kcml2ZXJzL2dwdS9kcm0vaTJjL3RkYTk5NTAuYwpAQCAtNDIzLDcg KzQyMyw3IEBAIHN0YXRpYyBpbnQgdGRhOTk1MF9wcm9iZShzdHJ1Y3QgaTJjX2NsaWVudCAqY2xp ZW50LAogCQlwcml2LT5oZG1pID0gZ2x1ZS0+cGFyZW50OwogCiAJcHJpdi0+YWRhcCA9IGNlY19h bGxvY2F0ZV9hZGFwdGVyKCZ0ZGE5OTUwX2NlY19vcHMsIHByaXYsICJ0ZGE5OTUwIiwKLQkJCQkJ ICBDRUNfQ0FQX0RFRkFVTFRTLAorCQkJCQkgIENFQ19DQVBfREVGQVVMVFMgfCBDRUNfQ0FQX0NP Tk5FQ1RPUl9JTkZPLAogCQkJCQkgIENFQ19NQVhfTE9HX0FERFJTKTsKIAlpZiAoSVNfRVJSKHBy aXYtPmFkYXApKQogCQlyZXR1cm4gUFRSX0VSUihwcml2LT5hZGFwKTsKQEAgLTQ2MCwxMyArNDYw LDE0IEBAIHN0YXRpYyBpbnQgdGRhOTk1MF9wcm9iZShzdHJ1Y3QgaTJjX2NsaWVudCAqY2xpZW50 LAogCWlmIChyZXQgPCAwKQogCQlyZXR1cm4gcmV0OwogCi0JcHJpdi0+bm90aWZ5ID0gY2VjX25v dGlmaWVyX2dldChwcml2LT5oZG1pKTsKKwlwcml2LT5ub3RpZnkgPSBjZWNfbm90aWZpZXJfY2Vj X2FkYXBfcmVnaXN0ZXIocHJpdi0+aGRtaSwgTlVMTCwKKwkJCQkJCSAgICAgIHByaXYtPmFkYXAp OwogCWlmICghcHJpdi0+bm90aWZ5KQogCQlyZXR1cm4gLUVOT01FTTsKIAogCXJldCA9IGNlY19y ZWdpc3Rlcl9hZGFwdGVyKHByaXYtPmFkYXAsIHByaXYtPmhkbWkpOwogCWlmIChyZXQgPCAwKSB7 Ci0JCWNlY19ub3RpZmllcl9wdXQocHJpdi0+bm90aWZ5KTsKKwkJY2VjX25vdGlmaWVyX2NlY19h ZGFwX3VucmVnaXN0ZXIocHJpdi0+bm90aWZ5KTsKIAkJcmV0dXJuIHJldDsKIAl9CiAKQEAgLTQ3 Niw4ICs0NzcsNiBAQCBzdGF0aWMgaW50IHRkYTk5NTBfcHJvYmUoc3RydWN0IGkyY19jbGllbnQg KmNsaWVudCwKIAkgKi8KIAlkZXZtX3JlbW92ZV9hY3Rpb24oZGV2LCB0ZGE5OTUwX2NlY19kZWws IHByaXYpOwogCi0JY2VjX3JlZ2lzdGVyX2NlY19ub3RpZmllcihwcml2LT5hZGFwLCBwcml2LT5u b3RpZnkpOwotCiAJcmV0dXJuIDA7CiB9CiAKQEAgLTQ4NSw4ICs0ODQsOCBAQCBzdGF0aWMgaW50 IHRkYTk5NTBfcmVtb3ZlKHN0cnVjdCBpMmNfY2xpZW50ICpjbGllbnQpCiB7CiAJc3RydWN0IHRk YTk5NTBfcHJpdiAqcHJpdiA9IGkyY19nZXRfY2xpZW50ZGF0YShjbGllbnQpOwogCisJY2VjX25v dGlmaWVyX2NlY19hZGFwX3VucmVnaXN0ZXIocHJpdi0+bm90aWZ5KTsKIAljZWNfdW5yZWdpc3Rl cl9hZGFwdGVyKHByaXYtPmFkYXApOwotCWNlY19ub3RpZmllcl9wdXQocHJpdi0+bm90aWZ5KTsK IAogCXJldHVybiAwOwogfQotLSAKMi4yMC4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0 cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9s aXN0aW5mby9kcmktZGV2ZWw=