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=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=unavailable 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 D3285C32753 for ; Wed, 14 Aug 2019 10:45:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A9906208C2 for ; Wed, 14 Aug 2019 10:45:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="wAGnbRj9" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727817AbfHNKpw (ORCPT ); Wed, 14 Aug 2019 06:45:52 -0400 Received: from mail-qk1-f201.google.com ([209.85.222.201]:50533 "EHLO mail-qk1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726704AbfHNKpw (ORCPT ); Wed, 14 Aug 2019 06:45:52 -0400 Received: by mail-qk1-f201.google.com with SMTP id e18so99026190qkl.17 for ; Wed, 14 Aug 2019 03:45:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=8XQAtQU5Jlu+LsGTeIXfkeaCQsZPIsgrkBYJbMGoesk=; b=wAGnbRj9PtduDVibdtuPHio7e/rJAlCgqGevJw5McsZd2dItB2v8f3QDxCwHSu8HnM hUudYGzKO7cP39DlSJRj4tGIzVVVD7YI5T4VmE5kX9Ysovpeys+pbhVZL19mRvhyQd+8 VLquRzmzP4RRraDhLhZzueBc3kZpUJqwnpT6b3CROj2A6T+JhMWMJRGpUjKUox6rDt72 F111botUFvVQxo0CP38qO0gmkZYQiQLXbzFf6gL2kTKpae0HQtsskmb1ezaYubpNWNwX 5o8X9kKoMAeofuebkUCLBd1/FR6Cd1qGADTZ3sbk+bh6Qg+9HVOoW6nWSeNsHZJ8SYh1 pu9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=8XQAtQU5Jlu+LsGTeIXfkeaCQsZPIsgrkBYJbMGoesk=; b=uoYhziRsmA8Bbxqg1CMy0y6r/WQ89JqbmRf7Ztr6nnxXiMW/YBErBe8s0hIaDiMS+r 1joKnKFEyB4dV62Fq/KBj31PpQolxwZ8uRcJUgFi6rZSc+VrQPYOBXURM82rx+E/dkY9 WxeEjewHbqKSznY6CtcqmfVVinXMh41W9ngr5dBfDlu5RuPxjGiOWUtExyH7Rn5w2HM0 yBtIfmkWxJUQBFeFnvRNXJ1ZCBJNux/hLPfxbWBHGLjz9ZP7lAjEla0kEN2x71a8WD9C 0PDI0bBr9gEwQuOks03rKOXuKs4qti3+MbIknYN3lb37KlJnT+/NaeROH8VLhlLaT/5G D+jw== X-Gm-Message-State: APjAAAVJgCCew0yIc6f5Tu3ugbrDVyL5ym0II3ylTAnne9sTQoQ5rLDy rHu+5+rGZPHV8H/upCZmo5voA8UwWgg= X-Google-Smtp-Source: APXvYqwFkux6bJUDOmhEL2ANd2DCyCR/Ryr/QNHOfXxiv2yXbVUydh25N5n46qj8ALQfXM0+XquobHEFP2Y= X-Received: by 2002:a05:6214:1254:: with SMTP id q20mr2062924qvv.164.1565779550564; Wed, 14 Aug 2019 03:45:50 -0700 (PDT) Date: Wed, 14 Aug 2019 12:45:01 +0200 In-Reply-To: <20190814104520.6001-1-darekm@google.com> Message-Id: <20190814104520.6001-4-darekm@google.com> Mime-Version: 1.0 References: <20190814104520.6001-1-darekm@google.com> X-Mailer: git-send-email 2.23.0.rc1.153.gdeed80330f-goog Subject: [PATCH v7 3/9] dw-hdmi-cec: use cec_notifier_cec_adap_(un)register From: Dariusz Marcinkiewicz To: dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, hverkuil-cisco@xs4all.nl Cc: Dariusz Marcinkiewicz , Andrzej Hajda , Neil Armstrong , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Kate Stewart , Allison Randal , Greg Kroah-Hartman , Thomas Gleixner , linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Use the new cec_notifier_cec_adap_(un)register() functions to (un)register the notifier for the CEC adapter. Also adds CEC_CAP_CONNECTOR_INFO capability to the adapter. Changes since v3: - add CEC_CAP_CONNECTOR_INFO to cec_allocate_adapter, - replace CEC_CAP_LOG_ADDRS | CEC_CAP_TRANSMIT | CEC_CAP_RC | CEC_CAP_PASSTHROUGH with CEC_CAP_DEFAULTS. Signed-off-by: Dariusz Marcinkiewicz Signed-off-by: Hans Verkuil Tested-by: Hans Verkuil --- drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c index 0f949978d3fcd..ac1e001d08829 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c @@ -256,8 +256,8 @@ static int dw_hdmi_cec_probe(struct platform_device *pdev) dw_hdmi_write(cec, 0, HDMI_CEC_POLARITY); cec->adap = cec_allocate_adapter(&dw_hdmi_cec_ops, cec, "dw_hdmi", - CEC_CAP_LOG_ADDRS | CEC_CAP_TRANSMIT | - CEC_CAP_RC | CEC_CAP_PASSTHROUGH, + CEC_CAP_DEFAULTS | + CEC_CAP_CONNECTOR_INFO, CEC_MAX_LOG_ADDRS); if (IS_ERR(cec->adap)) return PTR_ERR(cec->adap); @@ -278,13 +278,14 @@ static int dw_hdmi_cec_probe(struct platform_device *pdev) if (ret < 0) return ret; - cec->notify = cec_notifier_get(pdev->dev.parent); + cec->notify = cec_notifier_cec_adap_register(pdev->dev.parent, + NULL, cec->adap); if (!cec->notify) return -ENOMEM; ret = cec_register_adapter(cec->adap, pdev->dev.parent); if (ret < 0) { - cec_notifier_put(cec->notify); + cec_notifier_cec_adap_unregister(cec->notify); return ret; } @@ -294,8 +295,6 @@ static int dw_hdmi_cec_probe(struct platform_device *pdev) */ devm_remove_action(&pdev->dev, dw_hdmi_cec_del, cec); - cec_register_cec_notifier(cec->adap, cec->notify); - return 0; } @@ -303,8 +302,8 @@ static int dw_hdmi_cec_remove(struct platform_device *pdev) { struct dw_hdmi_cec *cec = platform_get_drvdata(pdev); + cec_notifier_cec_adap_unregister(cec->notify); cec_unregister_adapter(cec->adap); - cec_notifier_put(cec->notify); return 0; } -- 2.23.0.rc1.153.gdeed80330f-goog