From patchwork Tue Jan 16 13:19:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bogdan Purcareata X-Patchwork-Id: 10166871 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4AE6D600CA for ; Tue, 16 Jan 2018 13:21:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3CEA628488 for ; Tue, 16 Jan 2018 13:21:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 315622852E; Tue, 16 Jan 2018 13:21:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8459228488 for ; Tue, 16 Jan 2018 13:21:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=k6NGlPH7oRwtgpc6ZSWbqXFjiwpgXeU/shK9bXXQ/UU=; b=PMaUfUocKanVuz TJIfMtd3C6Nc+O0RrUd1TpfzT2cq0GHtXhJ0/V8kTx5v0aJRxP6C6uS4mKd9ODNmJmjMWeTwDyvTC EaO/BTdtJoheqYiT9yCHJy3sTcaemNkZ3pXNgeb21Gku1uk0d2MXF5zrCUyuTe/DyUeCquPMkR5NF O/h/ijdoEzClN/O9lzAIB4UP5b1aRbxSewaVZSWZPFYO+fBtSrMvQRrAc2CUNGbB9uwJpAZYC1PBG inuS6FavVG9OtWjQmOMykS1DqTJo5lKXKz3cXIDY2D4IsRKTL7WLzpqS6qSfOCeqYlDeIrymgYKRP IzY7vNdoCjpZYITP2rBQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1ebRAu-0006GQ-Uy; Tue, 16 Jan 2018 13:21:12 +0000 Received: from mail-by2nam01on0080.outbound.protection.outlook.com ([104.47.34.80] helo=NAM01-BY2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1ebR9j-0003HB-9F for linux-arm-kernel@lists.infradead.org; Tue, 16 Jan 2018 13:20:04 +0000 Received: from BN3PR03CA0082.namprd03.prod.outlook.com (10.167.1.170) by CY1PR03MB2363.namprd03.prod.outlook.com (10.166.207.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Tue, 16 Jan 2018 13:19:50 +0000 Received: from BN1AFFO11FD034.protection.gbl (2a01:111:f400:7c10::174) by BN3PR03CA0082.outlook.office365.com (2a01:111:e400:7a4d::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.407.7 via Frontend Transport; Tue, 16 Jan 2018 13:19:50 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; lists.infradead.org; dkim=none (message not signed) header.d=none;lists.infradead.org; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD034.mail.protection.outlook.com (10.58.52.158) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.345.12 via Frontend Transport; Tue, 16 Jan 2018 13:19:50 +0000 Received: from localhost.localdomain (fsr-ub1464-106.ea.freescale.net [10.171.82.96]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id w0GDJA11012166; Tue, 16 Jan 2018 06:19:45 -0700 From: Bogdan Purcareata To: , , Subject: [PATCH 5/8] staging: fsl-mc: Remove unnecessary dependency Date: Tue, 16 Jan 2018 15:19:07 +0200 Message-ID: <1516108750-24938-6-git-send-email-bogdan.purcareata@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516108750-24938-1-git-send-email-bogdan.purcareata@nxp.com> References: <1516108750-24938-1-git-send-email-bogdan.purcareata@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131605823903284985; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(1496009)(39860400002)(39380400002)(376002)(396003)(346002)(2980300002)(1110001)(1109001)(339900001)(199004)(189003)(2906002)(7416002)(305945005)(51416003)(4326008)(39060400002)(104016004)(6636002)(2950100002)(6666003)(356003)(5660300001)(105606002)(8676002)(47776003)(498600001)(50466002)(8936002)(106466001)(68736007)(50226002)(81166006)(81156014)(76176011)(8656006)(54906003)(110136005)(16586007)(48376002)(316002)(36756003)(77096006)(85426001)(53936002)(97736004)(49486002)(86362001)(2201001)(26005); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR03MB2363; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD034; 1:Fy0t27E09abWaind4iiLiCjHXWE3JD2HbwRJgyWQFVkepxBAiZPX+obvIw6eNouvaHj8kKDdqK69xrhJtZdMeC+ghil/x2UZmqoZasXBZOSIR5bwJXzPCRpOyZaw92as MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c1d8493e-87e0-4f8a-bef9-08d55ce3d297 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(5600026)(4604075)(2017052603307); SRVR:CY1PR03MB2363; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2363; 3:ecd8b+6MRILlydfPsIeqsxG2NQjq6TVtldkYddb9cKtWhPeEV0/5jX88XY+5ja/glOGY/AnrrkJCyUyfCK7TY2V0Jvczqr1gDd4Q470QT+MXa+OiJ34WZCyYi/mmMdgGk5AZpejb1fRgrcf71OQjLjsFP6mffxl1V+1sQENERdEW4PRAvxJGqRC6kReYot71d9TJ3IAzhqZF0URX3jxXZ/skjmRMGyIcgRDmlvc7nWO5lPhGR9SD54L6whhBCWfDn/jQsCbSp4mNlSGE+Em1r3q2v3JhdC0i4uuq7OohxthZQOXegQPaSI/VidSkEdPeTOJpKtBAwkbzELgmY2NLWuqIz0p3ySkdtXwgmnRT9bE=; 25:JXsSjSPB9gcZKO9qLpvzysxv6ohhcjiEPgEv0S3SSF/1s/BJqYnxv4r7krXfy0cFsTPg35CGEizt4iTKtoG9EhOzcYLhWDUFOcRYfmPUlItNQl81Z0z+sYeFfLHCbDbRecAJRxmHVxzLB/DJrokOCaDKl+94vX6KuHmtI8TeF56Lnqz4FcrXl3zQMsKDNj88+t7FtyBSla8ESXDszItLHLh6JBuI+QljAmyVOYQg97kFQz6f6eJuJgidFMjgB2s5MFavLv4dJSwoU1xl0HBitID1D0wDmPG/JIGHoWnqCD+a6Lvk1lEiC8OFTHaaYB8K6vzaPU5H6AMogh21r4A3Ng== X-MS-TrafficTypeDiagnostic: CY1PR03MB2363: X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2363; 31:jgB7wR27PHQA+o/HIJoSWzDhp5erZUSlZEOtoREsvG5aylvPw2AeMR4j1CvRs9PxpxP670saI79HZHX3LatkOpTsea0qJkkbhqgDieWU4u97Zr/JJeki+yHS064arf0E58pytrGl7M4dP4gNYaqUIpMRZYC6e3y4VXe0py/rputcs9jKhQBF5ZMSxH0UVJhTdp6xIhZyuTMXgfwEgO74IkM3gBcXKFmOr37+ZK9/3+M=; 4:sm1HWYQU+sA7/fXf5wxBC3fxd4CH5BY8jYXXfaDt/b6NAI7xuTQtxXnpzcJODSLBHBUPOJc9gpn0ECDKk5N8J06XmoMaoqnV/4VSwzVnvCY7bf0YOdbwXV9k8JrfQcy/qur+Tv3v/zJQtEpaFOVgSxaDZDybpfdN0K0hJPP1ZMvcHKfGbakYmkja+DPfPKQD9TEOmrfO+f31xGFxm49wl28hN8tgfUzZlpo3QJKcY8Kxz67jMbmwWGL1CDD493x3zMfQfQCJDhebwEhys15F3zGNOOiV52x87HR6vIKqhexT2D/gqqP4lJ1qTH0J2tBe X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(3231023)(944501161)(6055026)(6096035)(20161123559100)(201703131430075)(201703131448075)(201703131433075)(201703151042153)(20161123565025)(20161123563025)(20161123561025)(20161123556025)(201708071742011); SRVR:CY1PR03MB2363; BCL:0; PCL:0; RULEID:(100000803101)(100110400095)(400006); SRVR:CY1PR03MB2363; X-Forefront-PRVS: 0554B1F54F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR03MB2363; 23:Xgz7kntJnUglKMa41EyQSw+4npixj8HZV1UqUWjxd?= =?us-ascii?Q?tUivjRWzh1CSppMOYKIOazHQaGIGUAWbhdpwxYugu+K+X7eJdppGjAJGY7gV?= =?us-ascii?Q?LBNcncxyDp1G2W41vfjba9cN5/7pdi/qlKkxTQHWipR303Y/wzVIUxOdZeGr?= =?us-ascii?Q?GXrtv7Bs5fYdBaWwL3p2w0efjk7uq6sFevH7CZDHdSbEVtUwm2qiX+WH9B0I?= =?us-ascii?Q?lEcXIk2ygBvPsGZmpv9LxnicvfROwyyoBgBPyhb6orsCj95cPDnivHfjnJHl?= =?us-ascii?Q?kV1/hIBoq9iVRnDYkeLR3JUMm+9aFHXOt/hN6iZFpqcksWB9xFWc/FHK9PhU?= =?us-ascii?Q?SRRUznkuf5ojW7tMdMe1w2tYk2XFHbR6bHVSDirIHNVs4Noo9/rlN6bXpiNB?= =?us-ascii?Q?JKwybzPnbWWzd/kIYBAxZcRqTMlnfDo0AckiCB0qRTubOiB7oTmyXMF124JI?= =?us-ascii?Q?zmv5iRBvhQHU1bWN52IGzZDVA7d1Xs5TxW1vwv59NkulUr/fAXo8K950GjYZ?= =?us-ascii?Q?HMCQbDcX0vg8jtus6AVCSGAQT+WdzW8fHNf8gRZl/NLBm08xjKfECiwYIZXU?= =?us-ascii?Q?HLkC/iDnk29xq6Kp9hA5g5uQEtzkwdf7/xwuVed8Us1ThhF1jkdFMwcXZ01R?= =?us-ascii?Q?AQTmHQC/iLJeYOlyySbFBlS0NSrmbiRRlRFzGj8XDQlJH3v929wEMlI9J+4h?= =?us-ascii?Q?QB1nV6f11cW8yFom2n046IOBSRemIXfEH72XlD2wyMNdzTAh3DzrZBrGFWZG?= =?us-ascii?Q?qIGo2pTNFSXNDCd7EelKtVYI+oTstOoajgaiOQydvFN54r8GQ6oQt3WRblIq?= =?us-ascii?Q?SZMdcpbqEephSGuJ995unnvdWdqyfEiqzTruWSOzeXp8LLZ854Q23q+uUg2F?= =?us-ascii?Q?jkubfKqIpcYeeQQYoAnGIPQgr+IdpgIcXYLodVuWo+o7khScRfPPhvZzddvK?= =?us-ascii?Q?yB/1bEW5xWeAq5wwEX78+R3uK3PmRAUAgOcOmsQLRJ9FXBjUcm/vGXhd6VgI?= =?us-ascii?Q?v3gyMrN7oNufQpsPXwxcMvkgfWnHh5Ox/Fg9pFwzvBJTxxdJqm2Dq2eJXJb0?= =?us-ascii?Q?CSqDmq4ATKnHb9ZhLDx5iV4OVWEbhO8NuYVUC540YTrzxrUzhtoOII3qIDv9?= =?us-ascii?Q?T+GXm8b8o0AjuuflCLOG86nrCsYaWJyJjnjzgcMJLUejw5WeVA+f3XPoOYfH?= =?us-ascii?Q?GKqpcfK23IgdmM=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2363; 6:7wo4DkSOy//8Q9WRPbRGXGR39Fb0U9P3zpIfNgDiQvDFDAGldIaEQWbew6cXguq7/JldFnBUM3A3shz04flxsqW0OschZhc1/pm605WQQ5pFRpNDo68bgeqt5qg6VZtDxj97+PdRQfslx+h3laHm5gjE7M9I87hiNgn4BW5z/iXNNoyIUPkeeitwg2vGgQsaaIpHUTRrXbm1+xfGGFP8uW3aOqmBngDqQSQSVPZOa4srLg6MrdNOyDVAyQp2ICqOyCOCszqXZNDG9EZrbEUhsef+4rji7firsR5NZfcQZpLFEIzUpbLiiqAIh4Q3MQXQADilwTeRDYgB0uTeEOK7A2jKJkXp7yK6PA5b4hPFGJc=; 5:fTkkp8Z6Fv9v3LaFxQD1yxUXkhu47Pn4rCxsc9AZU862ASbVZxvmd6BdRFd1h0MxZ597/8CT5enbSW5TZcXuzS4Z9LjiOaClexb1MNxgKJJP0GsLW/atr3ouKsDE6jL2khu5/JENmt2JMGZvDvP8e74GF5ViR8CE1ZynkctWefQ=; 24:jEqXwXCVhmpmLzmAdzL4Yp1NaufuVjDwwIXNfUBfNEL03j2aVl0nM61YHk51iqaVVkiGA97e5XaEdBdDww3X/JcZHAv7uVlEP6rEZKu1794=; 7:3fqUhDsVij+RYqy4qKgCCLH+r0MQW5jkRGuwz3QNUKKea85gP4Hs95qK6H42vAYrJfFCNJnWrNcH9kfHfkZnJddlUXOfVyldKfXOvYy5rieLnB7SRbaZgDfPMH7AcfgKUaFbJzqdeTHtVERuxeKkJx5m09UTvgxTdO3lmfIg5IJv0Y5YyT9zikfOS+7s9sGsAxo5+uIdRKdzqCG0ouGw0AxjLCkGXSaZO2a58+9UJBAEPbdGg3BoGip9dQH/y0p+ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2018 13:19:50.0476 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c1d8493e-87e0-4f8a-bef9-08d55ce3d297 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB2363 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180116_051959_557780_3C58B631 X-CRM114-Status: GOOD ( 13.98 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, robh@kernel.org, stuyoder@gmail.com, arnd@arndb.de, marc.zyngier@arm.com, roy.pledge@nxp.com, ioana.ciornei@nxp.com, linux-kernel@vger.kernel.org, horia.geanta@nxp.com, nipun.gupta@nxp.com, tglx@linutronix.de, bogdan.purcareata@nxp.com, linux-arm-kernel@lists.infradead.org, jason@lakedaemon.net Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ioana Radulescu The function that enables fsl-mc msi interrupts doesn't need to be explicitly called from the fsl-mc bus driver initialization routine. Mark it to be independently called at system init; this is in line with how things are handled by other GICv3 irqchip users. Due to this change we now have an unused cleanup function, so remove it. Signed-off-by: Ioana Radulescu Reviewed-by: Laurentiu Tudor --- drivers/staging/fsl-mc/bus/fsl-mc-allocator.c | 5 ----- drivers/staging/fsl-mc/bus/fsl-mc-bus.c | 7 ------- drivers/staging/fsl-mc/bus/fsl-mc-private.h | 4 ---- drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c | 2 ++ 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c b/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c index 041d341..b9f5a56 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c +++ b/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c @@ -647,8 +647,3 @@ int __init fsl_mc_allocator_driver_init(void) { return fsl_mc_driver_register(&fsl_mc_allocator_driver); } - -void fsl_mc_allocator_driver_exit(void) -{ - fsl_mc_driver_unregister(&fsl_mc_allocator_driver); -} diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c index 0d010aa..9cb08c2 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c +++ b/drivers/staging/fsl-mc/bus/fsl-mc-bus.c @@ -932,15 +932,8 @@ static int __init fsl_mc_bus_driver_init(void) if (error < 0) goto error_cleanup_dprc_driver; - error = its_fsl_mc_msi_init(); - if (error < 0) - goto error_cleanup_mc_allocator; - return 0; -error_cleanup_mc_allocator: - fsl_mc_allocator_driver_exit(); - error_cleanup_dprc_driver: dprc_driver_exit(); diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-private.h b/drivers/staging/fsl-mc/bus/fsl-mc-private.h index a74186e..7e50cd4 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-private.h +++ b/drivers/staging/fsl-mc/bus/fsl-mc-private.h @@ -439,8 +439,6 @@ void dprc_driver_exit(void); int __init fsl_mc_allocator_driver_init(void); -void fsl_mc_allocator_driver_exit(void); - void fsl_mc_init_all_resource_pools(struct fsl_mc_device *mc_bus_dev); void fsl_mc_cleanup_all_resource_pools(struct fsl_mc_device *mc_bus_dev); @@ -457,8 +455,6 @@ int fsl_mc_msi_domain_alloc_irqs(struct device *dev, void fsl_mc_msi_domain_free_irqs(struct device *dev); -int __init its_fsl_mc_msi_init(void); - int fsl_mc_find_msi_domain(struct device *mc_platform_dev, struct irq_domain **mc_msi_domain); diff --git a/drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c b/drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c index 097c401f..506fce1 100644 --- a/drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c +++ b/drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c @@ -97,3 +97,5 @@ int __init its_fsl_mc_msi_init(void) return 0; } + +early_initcall(its_fsl_mc_msi_init);