Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 941943cf authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Greg Kroah-Hartman
Browse files

drivers/hwtracing: make coresight-* explicitly non-modular 



None of the Kconfig currently controlling compilation of any of
the files here are tristate, meaning that none of it currently
is being built as a module by anyone.

We need not be concerned about .remove functions and blocking the
unbind sysfs operations, since that was already done in a recent
commit.

Lets remove any remaining modular references, so that when reading the
drivers there is no doubt they are builtin-only.

All drivers get mostly the same changes, so they are handled in batch.
Changes are (1) convert to builtin_amba_driver, (2) delete module.h
include where unused, and (3) relocate the description into the
comments so we don't need MODULE_DESCRIPTION and associated tags.

The etm3x and etm4x use module_param_named, and have been adjusted
to just include moduleparam.h for that purpose.

In commit f309d444 ("platform_device:
better support builtin boilerplate avoidance") we introduced the
builtin_driver macro.

Here we use that support and extend it to amba driver registration,
so where a driver is clearly non-modular and builtin-only, we can
update with the simple mapping of

     module_amba_driver(...)  ---> builtin_amba_driver(...)

Since module_amba_driver() uses the same init level priority as
builtin_amba_driver() the init ordering remains unchanged with
this commit.

Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Acked-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 17534ceb

drivers/hwtracing/coresight/coresight-etb10.c

+3 −6
Original line number Diff line number Diff line 
/* Copyright (c) 2011-2012, The Linux Foundation. All rights reserved.

 *

 * Description: CoreSight Embedded Trace Buffer driver

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -12,7 +14,6 @@ 


#include <asm/local.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/types.h>

#include <linux/device.h>
@@ -781,8 +782,4 @@ static struct amba_driver etb_driver = { 
	.probe		= etb_probe,

	.id_table	= etb_ids,

};



module_amba_driver(etb_driver);



MODULE_LICENSE("GPL v2");

MODULE_DESCRIPTION("CoreSight Embedded Trace Buffer driver");
 
builtin_amba_driver(etb_driver);

drivers/hwtracing/coresight/coresight-etm3x.c

+8 −6
Original line number Diff line number Diff line 
/* Copyright (c) 2011-2012, The Linux Foundation. All rights reserved.

 *

 * Description: CoreSight Program Flow Trace driver

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -11,7 +13,7 @@ 
 */



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/init.h>

#include <linux/types.h>

#include <linux/device.h>
@@ -38,6 +40,10 @@ 
#include "coresight-etm.h"

#include "coresight-etm-perf.h"



/*

 * Not really modular but using module_param is the easiest way to

 * remain consistent with existing use cases for now.

 */

static int boot_enable;

module_param_named(boot_enable, boot_enable, int, S_IRUGO);
@@ -912,8 +918,4 @@ static struct amba_driver etm_driver = { 
	.probe		= etm_probe,

	.id_table	= etm_ids,

};



module_amba_driver(etm_driver);



MODULE_LICENSE("GPL v2");

MODULE_DESCRIPTION("CoreSight Program Flow Trace driver");
 
builtin_amba_driver(etm_driver);

drivers/hwtracing/coresight/coresight-etm4x.c

+1 −3
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/init.h>

#include <linux/types.h>

#include <linux/device.h>

#include <linux/module.h>

#include <linux/io.h>

#include <linux/err.h>

#include <linux/fs.h>
@@ -2710,5 +2709,4 @@ static struct amba_driver etm4x_driver = { 
	.probe		= etm4_probe,

	.id_table	= etm4_ids,

};



module_amba_driver(etm4x_driver);
 
builtin_amba_driver(etm4x_driver);

drivers/hwtracing/coresight/coresight-funnel.c

+3 −6
Original line number Diff line number Diff line 
/* Copyright (c) 2011-2012, The Linux Foundation. All rights reserved.

 *

 * Description: CoreSight Funnel driver

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -11,7 +13,6 @@ 
 */



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/types.h>

#include <linux/device.h>
@@ -268,8 +269,4 @@ static struct amba_driver funnel_driver = { 
	.probe		= funnel_probe,

	.id_table	= funnel_ids,

};



module_amba_driver(funnel_driver);



MODULE_LICENSE("GPL v2");

MODULE_DESCRIPTION("CoreSight Funnel driver");
 
builtin_amba_driver(funnel_driver);

drivers/hwtracing/coresight/coresight-replicator-qcom.c

+1 −3
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/clk.h>

#include <linux/coresight.h>

#include <linux/device.h>

#include <linux/module.h>

#include <linux/err.h>

#include <linux/init.h>

#include <linux/io.h>
@@ -198,5 +197,4 @@ static struct amba_driver replicator_driver = { 
	.probe		= replicator_probe,

	.id_table	= replicator_ids,

};



module_amba_driver(replicator_driver);
 
builtin_amba_driver(replicator_driver);