All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tingwei Zhang <tingwei@codeaurora.org>
To: Mathieu Poirier <mathieu.poirier@linaro.org>,
	Suzuki K Poulose <suzuki.poulose@arm.com>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Mike Leach <mike.leach@linaro.org>
Cc: tsoni@codeaurora.org,
	Sai Prakash Ranjan <saiprakash.ranjan@codeaurora.org>,
	Kim Phillips <kim.phillips@arm.com>,
	Mao Jinlong <jinlmao@codeaurora.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	coresight@lists.linaro.org, Randy Dunlap <rdunlap@infradead.org>,
	Mian Yousaf Kaukab <ykaukab@suse.de>,
	Russell King <linux@armlinux.org.uk>,
	Tingwei Zhang <tingwei@codeaurora.org>,
	Leo Yan <leo.yan@linaro.org>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 15/22] coresight: replicator: remove multiple init calls
Date: Sat, 25 Jul 2020 17:55:23 +0800	[thread overview]
Message-ID: <20200725095530.18053-16-tingwei@codeaurora.org> (raw)
In-Reply-To: <20200725095530.18053-1-tingwei@codeaurora.org>

From: Mian Yousaf Kaukab <ykaukab@suse.de>

Dynamic-replicator uses module_amba_driver to register. Whereas
static-replicator uses builtin_platform_driver. Combine these init
calls into a single module_init/exit pair in preparation to make the
driver modular.

Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>
Signed-off-by: Tingwei Zhang <tingwei@codeaurora.org>
---
 .../coresight/coresight-replicator.c          | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c
index 78acf29c49ca..6b30bcee7458 100644
--- a/drivers/hwtracing/coresight/coresight-replicator.c
+++ b/drivers/hwtracing/coresight/coresight-replicator.c
@@ -360,7 +360,6 @@ static struct platform_driver static_replicator_driver = {
 		.suppress_bind_attrs = true,
 	},
 };
-builtin_platform_driver(static_replicator_driver);
 
 static int dynamic_replicator_probe(struct amba_device *adev,
 				    const struct amba_id *id)
@@ -383,4 +382,31 @@ static struct amba_driver dynamic_replicator_driver = {
 	.probe		= dynamic_replicator_probe,
 	.id_table	= dynamic_replicator_ids,
 };
-builtin_amba_driver(dynamic_replicator_driver);
+
+static int __init replicator_init(void)
+{
+	int ret;
+
+	ret = platform_driver_register(&static_replicator_driver);
+	if (ret) {
+		pr_info("Error registering platform driver\n");
+		return ret;
+	}
+
+	ret = amba_driver_register(&dynamic_replicator_driver);
+	if (ret) {
+		pr_info("Error registering amba driver\n");
+		platform_driver_unregister(&static_replicator_driver);
+	}
+
+	return ret;
+}
+
+static void __exit replicator_exit(void)
+{
+	platform_driver_unregister(&static_replicator_driver);
+	amba_driver_unregister(&dynamic_replicator_driver);
+}
+
+module_init(replicator_init);
+module_exit(replicator_exit);
-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2020-07-25 10:01 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-25  9:55 [PATCH v5 00/22] coresight: allow to build coresight as modules Tingwei Zhang
2020-07-25  9:55 ` [PATCH v5 01/22] coresight: cpu_debug: add module name in Kconfig Tingwei Zhang
2020-07-27  9:41   ` Suzuki K Poulose
2020-07-25  9:55 ` [PATCH v5 02/22] coresight: cpu_debug: define MODULE_DEVICE_TABLE Tingwei Zhang
2020-07-25  9:55 ` [PATCH v5 03/22] coresight: use IS_ENABLED for CONFIGs that may be modules Tingwei Zhang
2020-07-25  9:55 ` [PATCH v5 04/22] coresight: add coresight prefix to barrier_pkt Tingwei Zhang
2020-07-25  9:55 ` [PATCH v5 05/22] coresight: export global symbols Tingwei Zhang
2020-07-25  9:55 ` [PATCH v5 06/22] coresight: add try_get_module() in coresight_grab_device() Tingwei Zhang
2020-07-25  9:55 ` [PATCH v5 07/22] coresight: stm: allow to build coresight-stm as a module Tingwei Zhang
2020-07-25  9:55 ` [PATCH v5 08/22] coresight: etm: perf: Fix warning caused by etm_setup_aux failure Tingwei Zhang
2020-07-25  9:55 ` [PATCH v5 09/22] coresight: etm3x: allow etm3x to be built as a module Tingwei Zhang
2020-07-25  9:55 ` [PATCH v5 10/22] coresight: etm4x: allow etm4x " Tingwei Zhang
2020-07-25  9:55 ` [PATCH v5 11/22] coresight: etb: allow etb " Tingwei Zhang
2020-07-25  9:55 ` [PATCH v5 12/22] coresight: tpiu: allow tpiu " Tingwei Zhang
2020-07-25  9:55 ` [PATCH v5 13/22] coresight: tmc: allow tmc " Tingwei Zhang
2020-07-25  9:55 ` [PATCH v5 14/22] coresight: funnel: remove multiple init calls from funnel driver Tingwei Zhang
2020-07-25  9:55 ` Tingwei Zhang [this message]
2020-07-25  9:55 ` [PATCH v5 16/22] coresight: allow funnel and replicator drivers to be built as modules Tingwei Zhang
2020-07-25  9:55 ` [PATCH v5 17/22] coresight: cti: add function to register cti associate ops Tingwei Zhang
2020-07-25  9:55 ` [PATCH v5 18/22] coresight: cti: Fix remove sysfs link error Tingwei Zhang
2020-07-25  9:55 ` [PATCH v5 19/22] coresight: cti: allow cti to be built as a module Tingwei Zhang
2020-07-25  9:55 ` [PATCH v5 20/22] coresight: tmc-etr: add function to register catu ops Tingwei Zhang
2020-07-25  9:55 ` [PATCH v5 21/22] coresight: catu: allow catu drivers to be built as modules Tingwei Zhang
2020-07-25  9:55 ` [PATCH v5 22/22] coresight: allow the coresight core driver to be built as a module Tingwei Zhang

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=20200725095530.18053-16-tingwei@codeaurora.org \
    --to=tingwei@codeaurora.org \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=coresight@lists.linaro.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=jinlmao@codeaurora.org \
    --cc=kim.phillips@arm.com \
    --cc=leo.yan@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux@armlinux.org.uk \
    --cc=mathieu.poirier@linaro.org \
    --cc=mike.leach@linaro.org \
    --cc=rdunlap@infradead.org \
    --cc=saiprakash.ranjan@codeaurora.org \
    --cc=suzuki.poulose@arm.com \
    --cc=tsoni@codeaurora.org \
    --cc=ykaukab@suse.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.