[PATCH v2 2/3] iommu/sound: Use component_match_add_of helper

[Sean Anderson]

On 1/3/23 11:15, Maxime Ripard wrote:
> Hi Robin,
> 
> On Tue, Jan 03, 2023 at 01:01:07PM +0000, Robin Murphy wrote:
>> 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 <sean.anderson at seco.com>
>> > Acked-by: Mark Brown <broonie at kernel.org>
>> > ---
>> > 
>> > 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
> 
> As far as I can see, that patch doesn't affect DRM at all, and the
> commit you pointed to doesn't either, nor has it been merged through the
> DRM tree.
> 
> Can you expand a bit on how we're involved in this, what we should
> clarify or help with?

Patches 2 and 3 of this series depend on patch 1. Since patch 3 contains
the bulk of the changes, I based this series on the drm-next tree.
However, patch 2 has a conflict elswhere in the tree, which did not
appear until 6.2-rc1. At the time I sent out this series, drm-next did
not contain this commit, and I couldn't find it based on Robin's
description [1], so now we end up with a conflict. As this commit has
now been merged into drm-next, I can rebase and resend if there are no
other comments.

--Sean

[1] https://lore.kernel.org/linux-arm-kernel/56310773-a062-0e48-28f7-6d2c5d035fee@seco.com/