mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stephen Boyd <swboyd@chromium.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
	dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org,
	Daniel Vetter <daniel.vetter@ffwll.ch>,
	Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	"Rafael J. Wysocki" <rafael@kernel.org>,
	Rob Clark <robdclark@gmail.com>,
	Russell King <rmk+kernel@arm.linux.org.uk>,
	Saravana Kannan <saravanak@google.com>
Subject: [PATCH v3 01/34] component: Introduce struct aggregate_device
Date: Mon, 25 Oct 2021 17:00:11 -0700	[thread overview]
Message-ID: <20211026000044.885195-2-swboyd@chromium.org> (raw)
In-Reply-To: <20211026000044.885195-1-swboyd@chromium.org>

Replace 'struct master' with 'struct aggregate_device' and then rename
'master' to 'adev' everywhere in the code. While we're here, put a
struct device inside the aggregate device so that we can register it
with a bus_type in the next patch.

The diff is large but that's because this is mostly a rename, where
sometimes 'master' is replaced with 'adev' and other times it is
replaced with 'parent' to indicate that the struct device that was being
used is actually the parent of the aggregate device and driver.

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Rob Clark <robdclark@gmail.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Saravana Kannan <saravanak@google.com>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
---
 drivers/base/component.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/drivers/base/component.c b/drivers/base/component.c
index 5e79299f6c3f..1c3c91ba7d2e 100644
--- a/drivers/base/component.c
+++ b/drivers/base/component.c
@@ -9,6 +9,7 @@
  */
 #include <linux/component.h>
 #include <linux/device.h>
+#include <linux/idr.h>
 #include <linux/kref.h>
 #include <linux/list.h>
 #include <linux/mutex.h>
@@ -64,7 +65,10 @@ struct master {
 
 	const struct component_master_ops *ops;
 	struct device *parent;
+	struct device dev;
 	struct component_match *match;
+
+	int id;
 };
 
 struct component {
@@ -80,6 +84,7 @@ struct component {
 static DEFINE_MUTEX(component_mutex);
 static LIST_HEAD(component_list);
 static LIST_HEAD(masters);
+static DEFINE_IDA(aggregate_ida);
 
 #ifdef CONFIG_DEBUG_FS
 
@@ -440,6 +445,7 @@ static void free_master(struct master *master)
 		}
 	}
 
+	ida_free(&aggregate_ida, master->id);
 	kfree(master);
 }
 
@@ -460,7 +466,7 @@ int component_master_add_with_match(struct device *parent,
 	struct component_match *match)
 {
 	struct master *master;
-	int ret;
+	int ret, id;
 
 	/* Reallocate the match array for its true size */
 	ret = component_match_realloc(match, match->num);
@@ -471,9 +477,17 @@ int component_master_add_with_match(struct device *parent,
 	if (!master)
 		return -ENOMEM;
 
+	id = ida_alloc(&aggregate_ida, GFP_KERNEL);
+	if (id < 0) {
+		kfree(master);
+		return id;
+	}
+
+	master->id = id;
 	master->parent = parent;
 	master->ops = ops;
 	master->match = match;
+	dev_set_name(&master->dev, "aggregate%d", id);
 
 	component_master_debugfs_add(master);
 	/* Add to the list of available masters. */
-- 
https://chromeos.dev


  reply	other threads:[~2021-10-26  0:04 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-26  0:00 [PATCH v3 00/34] component: Make into an aggregate bus Stephen Boyd
2021-10-26  0:00 ` Stephen Boyd [this message]
2021-10-26  0:00 ` [PATCH v3 02/34] component: Remove most references to 'master' Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 03/34] component: Introduce the aggregate bus_type Stephen Boyd
2021-10-26  4:40   ` kernel test robot
2021-10-26 14:02   ` kernel test robot
2021-10-26 19:33     ` Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 04/34] component: Move struct aggregate_device out to header file Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 05/34] component: Add {bind,unbind}_component() ops that take aggregate device Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 06/34] drm/of: Add a drm_of_aggregate_probe() API Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 07/34] drm/msm: Migrate to aggregate driver Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 08/34] drm/komeda: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 09/34] drm/arm/hdlcd: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 10/34] drm/malidp: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 11/34] drm/armada: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 12/34] drm/etnaviv: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 13/34] drm/kirin: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 14/34] drm/exynos: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 15/34] drm/imx: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 16/34] drm/ingenic: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 17/34] drm/mcde: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 18/34] drm/mediatek: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 19/34] drm/meson: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 20/34] drm/omap: " Stephen Boyd
2021-10-26 23:52   ` kernel test robot
2021-10-26  0:00 ` [PATCH v3 21/34] drm/rockchip: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 22/34] drm/sti: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 23/34] drm/sun4i: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 24/34] drm/tilcdc: " Stephen Boyd
2021-11-01 19:35   ` Jyri Sarha
2021-10-26  0:00 ` [PATCH v3 25/34] drm/vc4: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 26/34] drm/zte: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 27/34] iommu/mtk: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 28/34] mei: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 29/34] power: supply: ab8500: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 30/34] fbdev: omap2: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 31/34] sound: hdac: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 32/34] ASoC: codecs: wcd938x: " Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 33/34] component: Get rid of drm_of_component_probe() Stephen Boyd
2021-10-26  0:00 ` [PATCH v3 34/34] component: Remove component_master_ops and friends Stephen Boyd

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211026000044.885195-2-swboyd@chromium.org \
    --to=swboyd@chromium.org \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=freedreno@lists.freedesktop.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rafael@kernel.org \
    --cc=rmk+kernel@arm.linux.org.uk \
    --cc=robdclark@gmail.com \
    --cc=saravanak@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®