mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-18 00:24:58 +08:00
5a0e3ad6af
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
137 lines
3.8 KiB
C
137 lines
3.8 KiB
C
/*======================================================================
|
|
|
|
Device driver for the PCMCIA control functionality of StrongARM
|
|
SA-1100 microprocessors.
|
|
|
|
The contents of this file are subject to the Mozilla Public
|
|
License Version 1.1 (the "License"); you may not use this file
|
|
except in compliance with the License. You may obtain a copy of
|
|
the License at http://www.mozilla.org/MPL/
|
|
|
|
Software distributed under the License is distributed on an "AS
|
|
IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
|
|
implied. See the License for the specific language governing
|
|
rights and limitations under the License.
|
|
|
|
The initial developer of the original code is John G. Dorsey
|
|
<john+@cs.cmu.edu>. Portions created by John G. Dorsey are
|
|
Copyright (C) 1999 John G. Dorsey. All Rights Reserved.
|
|
|
|
Alternatively, the contents of this file may be used under the
|
|
terms of the GNU Public License version 2 (the "GPL"), in which
|
|
case the provisions of the GPL are applicable instead of the
|
|
above. If you wish to allow the use of your version of this file
|
|
only under the terms of the GPL and not to allow others to use
|
|
your version of this file under the MPL, indicate your decision
|
|
by deleting the provisions above and replace them with the notice
|
|
and other provisions required by the GPL. If you do not delete
|
|
the provisions above, a recipient may use your version of this
|
|
file under either the MPL or the GPL.
|
|
|
|
======================================================================*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/init.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/platform_device.h>
|
|
|
|
#include <pcmcia/cs_types.h>
|
|
#include <pcmcia/cs.h>
|
|
#include <pcmcia/ss.h>
|
|
|
|
#include <asm/hardware/scoop.h>
|
|
|
|
#include "sa1100_generic.h"
|
|
|
|
int __init pcmcia_collie_init(struct device *dev);
|
|
|
|
static int (*sa11x0_pcmcia_hw_init[])(struct device *dev) = {
|
|
#ifdef CONFIG_SA1100_ASSABET
|
|
pcmcia_assabet_init,
|
|
#endif
|
|
#ifdef CONFIG_SA1100_CERF
|
|
pcmcia_cerf_init,
|
|
#endif
|
|
#if defined(CONFIG_SA1100_H3100) || defined(CONFIG_SA1100_H3600)
|
|
pcmcia_h3600_init,
|
|
#endif
|
|
#ifdef CONFIG_SA1100_SHANNON
|
|
pcmcia_shannon_init,
|
|
#endif
|
|
#ifdef CONFIG_SA1100_SIMPAD
|
|
pcmcia_simpad_init,
|
|
#endif
|
|
#ifdef CONFIG_SA1100_COLLIE
|
|
pcmcia_collie_init,
|
|
#endif
|
|
};
|
|
|
|
static int sa11x0_drv_pcmcia_probe(struct platform_device *dev)
|
|
{
|
|
int i, ret = -ENODEV;
|
|
|
|
/*
|
|
* Initialise any "on-board" PCMCIA sockets.
|
|
*/
|
|
for (i = 0; i < ARRAY_SIZE(sa11x0_pcmcia_hw_init); i++) {
|
|
ret = sa11x0_pcmcia_hw_init[i](&dev->dev);
|
|
if (ret == 0)
|
|
break;
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
|
|
static int sa11x0_drv_pcmcia_remove(struct platform_device *dev)
|
|
{
|
|
struct skt_dev_info *sinfo = platform_get_drvdata(dev);
|
|
int i;
|
|
|
|
platform_set_drvdata(dev, NULL);
|
|
|
|
for (i = 0; i < sinfo->nskt; i++)
|
|
soc_pcmcia_remove_one(&sinfo->skt[i]);
|
|
|
|
kfree(sinfo);
|
|
return 0;
|
|
}
|
|
|
|
static struct platform_driver sa11x0_pcmcia_driver = {
|
|
.driver = {
|
|
.name = "sa11x0-pcmcia",
|
|
.owner = THIS_MODULE,
|
|
},
|
|
.probe = sa11x0_drv_pcmcia_probe,
|
|
.remove = sa11x0_drv_pcmcia_remove,
|
|
};
|
|
|
|
/* sa11x0_pcmcia_init()
|
|
* ^^^^^^^^^^^^^^^^^^^^
|
|
*
|
|
* This routine performs low-level PCMCIA initialization and then
|
|
* registers this socket driver with Card Services.
|
|
*
|
|
* Returns: 0 on success, -ve error code on failure
|
|
*/
|
|
static int __init sa11x0_pcmcia_init(void)
|
|
{
|
|
return platform_driver_register(&sa11x0_pcmcia_driver);
|
|
}
|
|
|
|
/* sa11x0_pcmcia_exit()
|
|
* ^^^^^^^^^^^^^^^^^^^^
|
|
* Invokes the low-level kernel service to free IRQs associated with this
|
|
* socket controller and reset GPIO edge detection.
|
|
*/
|
|
static void __exit sa11x0_pcmcia_exit(void)
|
|
{
|
|
platform_driver_unregister(&sa11x0_pcmcia_driver);
|
|
}
|
|
|
|
MODULE_AUTHOR("John Dorsey <john+@cs.cmu.edu>");
|
|
MODULE_DESCRIPTION("Linux PCMCIA Card Services: SA-11x0 Socket Controller");
|
|
MODULE_LICENSE("Dual MPL/GPL");
|
|
|
|
fs_initcall(sa11x0_pcmcia_init);
|
|
module_exit(sa11x0_pcmcia_exit);
|