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 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2180DC46467 for ; Tue, 3 Jan 2023 13:02:12 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id A3352DBF8; Tue, 3 Jan 2023 14:01:20 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz A3352DBF8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1672750930; bh=NuosO/prXr2xQGkChWRAzT79ixrbSzxM4h9TTXCjPFI=; h=Date:Subject:To:References:From:In-Reply-To:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: Cc:From; b=MdI6ZN+H+XS73ZuUn8r8NGpmxkTXe0DYzmrC2xz4JaphSIfX1NqfP/0NeKWHDjZNg hvJDHBndpbF+wiqBELigqflrrJiH52b2AoO2+JMChwF7WICeVEJkkrMAAjvp+6j5q2 UY/hCDD+7uzbj7Iyr73MrKjOM5vbPotyzJugAMDA= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 44CCAF8047B; Tue, 3 Jan 2023 14:01:20 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id DFF2FF800C0; Tue, 3 Jan 2023 14:01:18 +0100 (CET) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by alsa1.perex.cz (Postfix) with ESMTP id 672D7F800C0 for ; Tue, 3 Jan 2023 14:01:16 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 672D7F800C0 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6C8471516; Tue, 3 Jan 2023 05:01:55 -0800 (PST) Received: from [10.1.196.40] (e121345-lin.cambridge.arm.com [10.1.196.40]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 6E6EC3F587; Tue, 3 Jan 2023 05:01:11 -0800 (PST) Message-ID: <7897d4a6-bf43-becd-3437-7a254f38f6be@arm.com> Date: Tue, 3 Jan 2023 13:01:07 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [PATCH v2 2/3] iommu/sound: Use component_match_add_of helper To: Sean Anderson , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , dri-devel@lists.freedesktop.org References: <20221222233759.1934852-1-sean.anderson@seco.com> <20221222233759.1934852-3-sean.anderson@seco.com> Content-Language: en-GB From: Robin Murphy In-Reply-To: <20221222233759.1934852-3-sean.anderson@seco.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alsa-devel@alsa-project.org, Joerg Roedel , Takashi Iwai , Liam Girdwood , linux-kernel@vger.kernel.org, iommu@lists.linux.dev, Mark Brown , linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Matthias Brugger , Will Deacon , Yong Wu Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" Hi Sean, On 22/12/2022 11:37 pm, Sean Anderson wrote: > Convert users of component_match_add_release with component_release_of > and component_compare_of to component_match_add_of. > > Signed-off-by: Sean Anderson > Acked-by: Mark Brown > --- > > Changes in v2: > - Split off from helper addition > > drivers/iommu/mtk_iommu.c | 3 +-- > drivers/iommu/mtk_iommu_v1.c | 3 +-- > sound/soc/codecs/wcd938x.c | 6 ++---- > 3 files changed, 4 insertions(+), 8 deletions(-) > > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > index 2ab2ecfe01f8..483b7a9e4410 100644 > --- a/drivers/iommu/mtk_iommu.c > +++ b/drivers/iommu/mtk_iommu.c > @@ -1079,8 +1079,7 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m > } > data->larb_imu[id].dev = &plarbdev->dev; > > - component_match_add_release(dev, match, component_release_of, > - component_compare_of, larbnode); > + component_match_add_of(dev, match, larbnode); I've long since given up trying to make sense of how the DRM tree works, but the conflicting change is definitely already in mainline: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=b5765a1b44bea9dfcae69c53ffeb4c689d0922a7 Thanks, Robin. > } > > /* Get smi-(sub)-common dev from the last larb. */ > diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c > index 6e0e65831eb7..fb09ed6bf550 100644 > --- a/drivers/iommu/mtk_iommu_v1.c > +++ b/drivers/iommu/mtk_iommu_v1.c > @@ -672,8 +672,7 @@ static int mtk_iommu_v1_probe(struct platform_device *pdev) > } > data->larb_imu[i].dev = &plarbdev->dev; > > - component_match_add_release(dev, &match, component_release_of, > - component_compare_of, larbnode); > + component_match_add_of(dev, &match, larbnode); > } > > platform_set_drvdata(pdev, data); > diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c > index aca06a4026f3..2f8444e54083 100644 > --- a/sound/soc/codecs/wcd938x.c > +++ b/sound/soc/codecs/wcd938x.c > @@ -4474,8 +4474,7 @@ static int wcd938x_add_slave_components(struct wcd938x_priv *wcd938x, > } > > of_node_get(wcd938x->rxnode); > - component_match_add_release(dev, matchptr, component_release_of, > - component_compare_of, wcd938x->rxnode); > + component_match_add_of(dev, matchptr, wcd938x->rxnode); > > wcd938x->txnode = of_parse_phandle(np, "qcom,tx-device", 0); > if (!wcd938x->txnode) { > @@ -4483,8 +4482,7 @@ static int wcd938x_add_slave_components(struct wcd938x_priv *wcd938x, > return -ENODEV; > } > of_node_get(wcd938x->txnode); > - component_match_add_release(dev, matchptr, component_release_of, > - component_compare_of, wcd938x->txnode); > + component_match_add_of(dev, matchptr, wcd938x->txnode); > return 0; > } > From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7200279C5 for ; Tue, 3 Jan 2023 13:01:14 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6C8471516; Tue, 3 Jan 2023 05:01:55 -0800 (PST) Received: from [10.1.196.40] (e121345-lin.cambridge.arm.com [10.1.196.40]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 6E6EC3F587; Tue, 3 Jan 2023 05:01:11 -0800 (PST) Message-ID: <7897d4a6-bf43-becd-3437-7a254f38f6be@arm.com> Date: Tue, 3 Jan 2023 13:01:07 +0000 Precedence: bulk X-Mailing-List: iommu@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [PATCH v2 2/3] iommu/sound: Use component_match_add_of helper To: Sean Anderson , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, Mark Brown , Jaroslav Kysela , Joerg Roedel , Liam Girdwood , Matthias Brugger , Takashi Iwai , Will Deacon , Yong Wu , alsa-devel@alsa-project.org, iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org References: <20221222233759.1934852-1-sean.anderson@seco.com> <20221222233759.1934852-3-sean.anderson@seco.com> Content-Language: en-GB From: Robin Murphy In-Reply-To: <20221222233759.1934852-3-sean.anderson@seco.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi Sean, On 22/12/2022 11:37 pm, Sean Anderson wrote: > Convert users of component_match_add_release with component_release_of > and component_compare_of to component_match_add_of. > > Signed-off-by: Sean Anderson > Acked-by: Mark Brown > --- > > Changes in v2: > - Split off from helper addition > > drivers/iommu/mtk_iommu.c | 3 +-- > drivers/iommu/mtk_iommu_v1.c | 3 +-- > sound/soc/codecs/wcd938x.c | 6 ++---- > 3 files changed, 4 insertions(+), 8 deletions(-) > > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > index 2ab2ecfe01f8..483b7a9e4410 100644 > --- a/drivers/iommu/mtk_iommu.c > +++ b/drivers/iommu/mtk_iommu.c > @@ -1079,8 +1079,7 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m > } > data->larb_imu[id].dev = &plarbdev->dev; > > - component_match_add_release(dev, match, component_release_of, > - component_compare_of, larbnode); > + component_match_add_of(dev, match, larbnode); I've long since given up trying to make sense of how the DRM tree works, but the conflicting change is definitely already in mainline: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=b5765a1b44bea9dfcae69c53ffeb4c689d0922a7 Thanks, Robin. > } > > /* Get smi-(sub)-common dev from the last larb. */ > diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c > index 6e0e65831eb7..fb09ed6bf550 100644 > --- a/drivers/iommu/mtk_iommu_v1.c > +++ b/drivers/iommu/mtk_iommu_v1.c > @@ -672,8 +672,7 @@ static int mtk_iommu_v1_probe(struct platform_device *pdev) > } > data->larb_imu[i].dev = &plarbdev->dev; > > - component_match_add_release(dev, &match, component_release_of, > - component_compare_of, larbnode); > + component_match_add_of(dev, &match, larbnode); > } > > platform_set_drvdata(pdev, data); > diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c > index aca06a4026f3..2f8444e54083 100644 > --- a/sound/soc/codecs/wcd938x.c > +++ b/sound/soc/codecs/wcd938x.c > @@ -4474,8 +4474,7 @@ static int wcd938x_add_slave_components(struct wcd938x_priv *wcd938x, > } > > of_node_get(wcd938x->rxnode); > - component_match_add_release(dev, matchptr, component_release_of, > - component_compare_of, wcd938x->rxnode); > + component_match_add_of(dev, matchptr, wcd938x->rxnode); > > wcd938x->txnode = of_parse_phandle(np, "qcom,tx-device", 0); > if (!wcd938x->txnode) { > @@ -4483,8 +4482,7 @@ static int wcd938x_add_slave_components(struct wcd938x_priv *wcd938x, > return -ENODEV; > } > of_node_get(wcd938x->txnode); > - component_match_add_release(dev, matchptr, component_release_of, > - component_compare_of, wcd938x->txnode); > + component_match_add_of(dev, matchptr, wcd938x->txnode); > return 0; > } > 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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6FC5CC3DA7D for ; Tue, 3 Jan 2023 16:06:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=bOD7jRqHaZxOlnqVfsXAN479qHCtoxmoV9BhClEy1Jo=; b=szhUAXoz30i86u OVzAhq+IjMmk0Mj8QXPw+JnSEG8xHRnrisi3ZjhvOmybZK9y1x1pQ2mnl+eS+SaP3WdywIomGu9uu CUi/Md5Kt2wSiRlfkiyniwags0BPaEKmFh/wDwntwKmKLu9MSIE4vvW1T0afnBEp2cUUFr/sogLRu 2hL7hgEBQqWMwm3vYmKNBqRneolZlJRag7x2ZcEy2Fw+guv6hgMQMUcxn3Fx/kxV4Rohze44ytW96 NGKD0VKwBc7PdnaBHVr2OMSc6K5rYnvPOKpeQPnt0xTzjYQws0FfNwtDYquVjyFaZ5M6d4pE3RdlA 5hBq3n2yeMdh5Tb569yg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pCjn4-002kih-FG; Tue, 03 Jan 2023 16:05:27 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pCgv0-001NE4-30; Tue, 03 Jan 2023 13:01:28 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6C8471516; Tue, 3 Jan 2023 05:01:55 -0800 (PST) Received: from [10.1.196.40] (e121345-lin.cambridge.arm.com [10.1.196.40]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 6E6EC3F587; Tue, 3 Jan 2023 05:01:11 -0800 (PST) Message-ID: <7897d4a6-bf43-becd-3437-7a254f38f6be@arm.com> Date: Tue, 3 Jan 2023 13:01:07 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [PATCH v2 2/3] iommu/sound: Use component_match_add_of helper To: Sean Anderson , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org, Mark Brown , Jaroslav Kysela , Joerg Roedel , Liam Girdwood , Matthias Brugger , Takashi Iwai , Will Deacon , Yong Wu , alsa-devel@alsa-project.org, iommu@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org References: <20221222233759.1934852-1-sean.anderson@seco.com> <20221222233759.1934852-3-sean.anderson@seco.com> Content-Language: en-GB From: Robin Murphy In-Reply-To: <20221222233759.1934852-3-sean.anderson@seco.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230103_050126_296453_21A201A0 X-CRM114-Status: GOOD ( 18.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Sean, On 22/12/2022 11:37 pm, Sean Anderson wrote: > Convert users of component_match_add_release with component_release_of > and component_compare_of to component_match_add_of. > > Signed-off-by: Sean Anderson > Acked-by: Mark Brown > --- > > Changes in v2: > - Split off from helper addition > > drivers/iommu/mtk_iommu.c | 3 +-- > drivers/iommu/mtk_iommu_v1.c | 3 +-- > sound/soc/codecs/wcd938x.c | 6 ++---- > 3 files changed, 4 insertions(+), 8 deletions(-) > > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > index 2ab2ecfe01f8..483b7a9e4410 100644 > --- a/drivers/iommu/mtk_iommu.c > +++ b/drivers/iommu/mtk_iommu.c > @@ -1079,8 +1079,7 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m > } > data->larb_imu[id].dev = &plarbdev->dev; > > - component_match_add_release(dev, match, component_release_of, > - component_compare_of, larbnode); > + component_match_add_of(dev, match, larbnode); I've long since given up trying to make sense of how the DRM tree works, but the conflicting change is definitely already in mainline: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=b5765a1b44bea9dfcae69c53ffeb4c689d0922a7 Thanks, Robin. > } > > /* Get smi-(sub)-common dev from the last larb. */ > diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c > index 6e0e65831eb7..fb09ed6bf550 100644 > --- a/drivers/iommu/mtk_iommu_v1.c > +++ b/drivers/iommu/mtk_iommu_v1.c > @@ -672,8 +672,7 @@ static int mtk_iommu_v1_probe(struct platform_device *pdev) > } > data->larb_imu[i].dev = &plarbdev->dev; > > - component_match_add_release(dev, &match, component_release_of, > - component_compare_of, larbnode); > + component_match_add_of(dev, &match, larbnode); > } > > platform_set_drvdata(pdev, data); > diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c > index aca06a4026f3..2f8444e54083 100644 > --- a/sound/soc/codecs/wcd938x.c > +++ b/sound/soc/codecs/wcd938x.c > @@ -4474,8 +4474,7 @@ static int wcd938x_add_slave_components(struct wcd938x_priv *wcd938x, > } > > of_node_get(wcd938x->rxnode); > - component_match_add_release(dev, matchptr, component_release_of, > - component_compare_of, wcd938x->rxnode); > + component_match_add_of(dev, matchptr, wcd938x->rxnode); > > wcd938x->txnode = of_parse_phandle(np, "qcom,tx-device", 0); > if (!wcd938x->txnode) { > @@ -4483,8 +4482,7 @@ static int wcd938x_add_slave_components(struct wcd938x_priv *wcd938x, > return -ENODEV; > } > of_node_get(wcd938x->txnode); > - component_match_add_release(dev, matchptr, component_release_of, > - component_compare_of, wcd938x->txnode); > + component_match_add_of(dev, matchptr, wcd938x->txnode); > return 0; > } > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D4787C46467 for ; Tue, 3 Jan 2023 13:01:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F214A89083; Tue, 3 Jan 2023 13:01:16 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by gabe.freedesktop.org (Postfix) with ESMTP id 9E1ED89083 for ; Tue, 3 Jan 2023 13:01:14 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6C8471516; Tue, 3 Jan 2023 05:01:55 -0800 (PST) Received: from [10.1.196.40] (e121345-lin.cambridge.arm.com [10.1.196.40]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 6E6EC3F587; Tue, 3 Jan 2023 05:01:11 -0800 (PST) Message-ID: <7897d4a6-bf43-becd-3437-7a254f38f6be@arm.com> Date: Tue, 3 Jan 2023 13:01:07 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux aarch64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [PATCH v2 2/3] iommu/sound: Use component_match_add_of helper To: Sean Anderson , David Airlie , Daniel Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , dri-devel@lists.freedesktop.org References: <20221222233759.1934852-1-sean.anderson@seco.com> <20221222233759.1934852-3-sean.anderson@seco.com> Content-Language: en-GB From: Robin Murphy In-Reply-To: <20221222233759.1934852-3-sean.anderson@seco.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alsa-devel@alsa-project.org, Joerg Roedel , Takashi Iwai , Liam Girdwood , linux-kernel@vger.kernel.org, iommu@lists.linux.dev, Mark Brown , linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Matthias Brugger , Jaroslav Kysela , Will Deacon , Yong Wu Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Sean, On 22/12/2022 11:37 pm, Sean Anderson wrote: > Convert users of component_match_add_release with component_release_of > and component_compare_of to component_match_add_of. > > Signed-off-by: Sean Anderson > Acked-by: Mark Brown > --- > > Changes in v2: > - Split off from helper addition > > drivers/iommu/mtk_iommu.c | 3 +-- > drivers/iommu/mtk_iommu_v1.c | 3 +-- > sound/soc/codecs/wcd938x.c | 6 ++---- > 3 files changed, 4 insertions(+), 8 deletions(-) > > diff --git a/drivers/iommu/mtk_iommu.c b/drivers/iommu/mtk_iommu.c > index 2ab2ecfe01f8..483b7a9e4410 100644 > --- a/drivers/iommu/mtk_iommu.c > +++ b/drivers/iommu/mtk_iommu.c > @@ -1079,8 +1079,7 @@ static int mtk_iommu_mm_dts_parse(struct device *dev, struct component_match **m > } > data->larb_imu[id].dev = &plarbdev->dev; > > - component_match_add_release(dev, match, component_release_of, > - component_compare_of, larbnode); > + component_match_add_of(dev, match, larbnode); I've long since given up trying to make sense of how the DRM tree works, but the conflicting change is definitely already in mainline: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=b5765a1b44bea9dfcae69c53ffeb4c689d0922a7 Thanks, Robin. > } > > /* Get smi-(sub)-common dev from the last larb. */ > diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c > index 6e0e65831eb7..fb09ed6bf550 100644 > --- a/drivers/iommu/mtk_iommu_v1.c > +++ b/drivers/iommu/mtk_iommu_v1.c > @@ -672,8 +672,7 @@ static int mtk_iommu_v1_probe(struct platform_device *pdev) > } > data->larb_imu[i].dev = &plarbdev->dev; > > - component_match_add_release(dev, &match, component_release_of, > - component_compare_of, larbnode); > + component_match_add_of(dev, &match, larbnode); > } > > platform_set_drvdata(pdev, data); > diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c > index aca06a4026f3..2f8444e54083 100644 > --- a/sound/soc/codecs/wcd938x.c > +++ b/sound/soc/codecs/wcd938x.c > @@ -4474,8 +4474,7 @@ static int wcd938x_add_slave_components(struct wcd938x_priv *wcd938x, > } > > of_node_get(wcd938x->rxnode); > - component_match_add_release(dev, matchptr, component_release_of, > - component_compare_of, wcd938x->rxnode); > + component_match_add_of(dev, matchptr, wcd938x->rxnode); > > wcd938x->txnode = of_parse_phandle(np, "qcom,tx-device", 0); > if (!wcd938x->txnode) { > @@ -4483,8 +4482,7 @@ static int wcd938x_add_slave_components(struct wcd938x_priv *wcd938x, > return -ENODEV; > } > of_node_get(wcd938x->txnode); > - component_match_add_release(dev, matchptr, component_release_of, > - component_compare_of, wcd938x->txnode); > + component_match_add_of(dev, matchptr, wcd938x->txnode); > return 0; > } >