Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp758407pxb; Fri, 28 Jan 2022 09:19:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJyfAT9jx9WvAhDuJIjmBujWrnxQIiUL7+W68gqsbrDmOmpZZNDgN1vQflrqFgZlTuXb3ov+ X-Received: by 2002:a17:90b:1b08:: with SMTP id nu8mr10889496pjb.82.1643390384756; Fri, 28 Jan 2022 09:19:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643390384; cv=none; d=google.com; s=arc-20160816; b=Fq4Ey4rSipvsr/+Sj0x63/vm3mgMZvvAsIGRScdPHZvMiql3vdq9MZ9DvwgR/egmHQ pr5Gqqx6WTlqceS0BACraxek+gF0jVwnDSnwlnM4CEwEYfyCDAGaWUdK3DwSNuR9veA2 6gghmE3egaieSYKdrDSF5zTk+UhV/2nloBdDckUBbR6bWGP3lJHiyRUP81ZhLUb+4Y53 57BlNCKuVspcIsqILhFwFbGRbV763ZsFTa/o7bbg0bwOBK67TAq50tgHAtoYuVxGsOws GA/F5nUsQIoXhlrapqyHIdZ73x/Ba34+y+X3G3NWIrsvss7QeiLCXtNOqZxFPKVVmmYs VZjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=uoYkWU8ZYG31h//2O3CYJPowjGxvjjH2b6ZF0p9sQps=; b=XVzH4Njh1hH9JuM/TFJHWhRvFHFove/vIoiBh0GDFv/XEl3pYt0Myyf998FfCSYRn/ 1bIz0bj0Sr2b3LgsCHlZLc0VUKZeeIEyTr/3xn8CoOzeIk/qSj6n8ubnU8nQHgpespRB 7auw+HtscLMYQDk9aNbFj1/JeAPK2EwWman/Lbza/jrx7RGrkEfJztxMNSxfUfukLNWn jABeIsExLltr1RdCn9v70OAniGBfGc6vaaeVwQaDtEjHR8I3QGNXDtaFVgclhfhsIJu6 I13mjLjgGJ5VQFvtFRffzRC5Da85ZL5mBgMGH6B9CHcoJpktT7XcrdoluDOO/i0tZWaD 4FCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Npdvqs3d; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w2si5477572plz.170.2022.01.28.09.19.32; Fri, 28 Jan 2022 09:19:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Npdvqs3d; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240534AbiA0UDo (ORCPT + 99 others); Thu, 27 Jan 2022 15:03:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343759AbiA0UCf (ORCPT ); Thu, 27 Jan 2022 15:02:35 -0500 Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27630C061757 for ; Thu, 27 Jan 2022 12:02:35 -0800 (PST) Received: by mail-pf1-x431.google.com with SMTP id 192so3798099pfz.3 for ; Thu, 27 Jan 2022 12:02:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uoYkWU8ZYG31h//2O3CYJPowjGxvjjH2b6ZF0p9sQps=; b=Npdvqs3dgVEFL7SvLzWbajP/ltLnMywE5OL4sdVwIATKFbTuobWdTSdnjQGKqw+P3Q z4BL7Whjg+87X0sbFCE+X5hflua22Oq7YC76P11dk4ptrikhRbSZ2i7ugYtYodwBP3vb cjJ0P0mq6X5+92CpBNqeR6xJuk6b6giXEsfqQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uoYkWU8ZYG31h//2O3CYJPowjGxvjjH2b6ZF0p9sQps=; b=jl5I8/R0HtQ5WYVdzDy20v+RWGOaoqhTP8RVKNB4/BYvlVMjM3IaaAhBNsBwasQow2 ITCJdGM/CtKTp/0zs9914gVmVySodmoTEosuWWjwKMKiui21poVF936Rs+FAA44LXkeY 1xVtKLQji7Ln24RiqMumq77RcUoanQWQtVTjEGSFHL68qEqSxtLJOB03hFLkJpMju+lz 2wjS1L4KDs5PWUTAj/+PHqJBzgRisiB9i28Y/16DYV9sRMDZxnBxdL1/MU7QZLHVb0zR 1zOox/uX0AdzDQ3aulDEdhGaGgp6UelohxdGqmN2WbSsDZM3qYhKKHtuIS80zccaCYX9 olfg== X-Gm-Message-State: AOAM5322A/czXN0T/zkMJev8m4kY5i6PyX19cllRjsh2zAsD1KnrQcH+ tONuZ3Cy+K8fmVmnbigkmEUqWQ== X-Received: by 2002:a63:4b0b:: with SMTP id y11mr3862310pga.342.1643313754673; Thu, 27 Jan 2022 12:02:34 -0800 (PST) Received: from smtp.gmail.com ([2620:15c:202:201:9246:1838:3243:3071]) by smtp.gmail.com with ESMTPSA id k21sm6561190pff.33.2022.01.27.12.02.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Jan 2022 12:02:34 -0800 (PST) From: Stephen Boyd To: Greg Kroah-Hartman , Douglas Anderson Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, Mark Brown , Jaroslav Kysela , Daniel Vetter , "Rafael J. Wysocki" , Rob Clark , Russell King , Saravana Kannan Subject: [PATCH v6 30/35] ASoC: codecs: wcd938x: Migrate to aggregate driver Date: Thu, 27 Jan 2022 12:01:36 -0800 Message-Id: <20220127200141.1295328-31-swboyd@chromium.org> X-Mailer: git-send-email 2.35.0.rc0.227.g00780c9af4-goog In-Reply-To: <20220127200141.1295328-1-swboyd@chromium.org> References: <20220127200141.1295328-1-swboyd@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use an aggregate driver instead of component ops so that we can get proper driver probe ordering of the aggregate device with respect to all the component devices that make up the aggregate device. Acked-by: Mark Brown Cc: Jaroslav Kysela Cc: Daniel Vetter Cc: "Rafael J. Wysocki" Cc: Rob Clark Cc: Russell King Cc: Saravana Kannan Signed-off-by: Stephen Boyd --- sound/soc/codecs/wcd938x.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c index eff200a07d9f..6e1c9f93c819 100644 --- a/sound/soc/codecs/wcd938x.c +++ b/sound/soc/codecs/wcd938x.c @@ -4317,8 +4317,9 @@ static struct snd_soc_dai_driver wcd938x_dais[] = { }, }; -static int wcd938x_bind(struct device *dev) +static int wcd938x_bind(struct aggregate_device *adev) { + struct device *dev = aggregate_device_parent(adev); struct wcd938x_priv *wcd938x = dev_get_drvdata(dev); int ret; @@ -4401,8 +4402,9 @@ static int wcd938x_bind(struct device *dev) } -static void wcd938x_unbind(struct device *dev) +static void wcd938x_unbind(struct aggregate_device *adev) { + struct device *dev = aggregate_device_parent(adev); struct wcd938x_priv *wcd938x = dev_get_drvdata(dev); device_link_remove(dev, wcd938x->txdev); @@ -4412,9 +4414,13 @@ static void wcd938x_unbind(struct device *dev) component_unbind_all(dev, wcd938x); } -static const struct component_master_ops wcd938x_comp_ops = { - .bind = wcd938x_bind, - .unbind = wcd938x_unbind, +static struct aggregate_driver wcd938x_aggregate_driver = { + .probe = wcd938x_bind, + .remove = wcd938x_unbind, + .driver = { + .name = "wcd938x_snd", + .owner = THIS_MODULE, + }, }; static int wcd938x_compare_of(struct device *dev, void *data) @@ -4483,7 +4489,7 @@ static int wcd938x_probe(struct platform_device *pdev) wcd938x_reset(wcd938x); - ret = component_master_add_with_match(dev, &wcd938x_comp_ops, match); + ret = component_aggregate_register(dev, &wcd938x_aggregate_driver, match); if (ret) return ret; @@ -4499,7 +4505,7 @@ static int wcd938x_probe(struct platform_device *pdev) static int wcd938x_remove(struct platform_device *pdev) { - component_master_del(&pdev->dev, &wcd938x_comp_ops); + component_aggregate_unregister(&pdev->dev, &wcd938x_aggregate_driver); return 0; } -- https://chromeos.dev