mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
![Tejun Heo](/assets/img/avatar_default.png)
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>
233 lines
5.4 KiB
C
233 lines
5.4 KiB
C
/*
|
|
* Core driver for HTC PASIC3 LED/DS1WM chip.
|
|
*
|
|
* Copyright (C) 2006 Philipp Zabel <philipp.zabel@gmail.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; version 2 of the License.
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/module.h>
|
|
#include <linux/platform_device.h>
|
|
|
|
#include <linux/gpio.h>
|
|
#include <linux/io.h>
|
|
#include <linux/irq.h>
|
|
#include <linux/interrupt.h>
|
|
#include <linux/mfd/core.h>
|
|
#include <linux/mfd/ds1wm.h>
|
|
#include <linux/mfd/htc-pasic3.h>
|
|
#include <linux/slab.h>
|
|
|
|
struct pasic3_data {
|
|
void __iomem *mapping;
|
|
unsigned int bus_shift;
|
|
};
|
|
|
|
#define REG_ADDR 5
|
|
#define REG_DATA 6
|
|
|
|
#define READ_MODE 0x80
|
|
|
|
/*
|
|
* write to a secondary register on the PASIC3
|
|
*/
|
|
void pasic3_write_register(struct device *dev, u32 reg, u8 val)
|
|
{
|
|
struct pasic3_data *asic = dev_get_drvdata(dev);
|
|
int bus_shift = asic->bus_shift;
|
|
void __iomem *addr = asic->mapping + (REG_ADDR << bus_shift);
|
|
void __iomem *data = asic->mapping + (REG_DATA << bus_shift);
|
|
|
|
__raw_writeb(~READ_MODE & reg, addr);
|
|
__raw_writeb(val, data);
|
|
}
|
|
EXPORT_SYMBOL(pasic3_write_register); /* for leds-pasic3 */
|
|
|
|
/*
|
|
* read from a secondary register on the PASIC3
|
|
*/
|
|
u8 pasic3_read_register(struct device *dev, u32 reg)
|
|
{
|
|
struct pasic3_data *asic = dev_get_drvdata(dev);
|
|
int bus_shift = asic->bus_shift;
|
|
void __iomem *addr = asic->mapping + (REG_ADDR << bus_shift);
|
|
void __iomem *data = asic->mapping + (REG_DATA << bus_shift);
|
|
|
|
__raw_writeb(READ_MODE | reg, addr);
|
|
return __raw_readb(data);
|
|
}
|
|
EXPORT_SYMBOL(pasic3_read_register); /* for leds-pasic3 */
|
|
|
|
/*
|
|
* LEDs
|
|
*/
|
|
|
|
static struct mfd_cell led_cell __initdata = {
|
|
.name = "leds-pasic3",
|
|
};
|
|
|
|
/*
|
|
* DS1WM
|
|
*/
|
|
|
|
static int ds1wm_enable(struct platform_device *pdev)
|
|
{
|
|
struct device *dev = pdev->dev.parent;
|
|
int c;
|
|
|
|
c = pasic3_read_register(dev, 0x28);
|
|
pasic3_write_register(dev, 0x28, c & 0x7f);
|
|
|
|
dev_dbg(dev, "DS1WM OWM_EN low (active) %02x\n", c & 0x7f);
|
|
return 0;
|
|
}
|
|
|
|
static int ds1wm_disable(struct platform_device *pdev)
|
|
{
|
|
struct device *dev = pdev->dev.parent;
|
|
int c;
|
|
|
|
c = pasic3_read_register(dev, 0x28);
|
|
pasic3_write_register(dev, 0x28, c | 0x80);
|
|
|
|
dev_dbg(dev, "DS1WM OWM_EN high (inactive) %02x\n", c | 0x80);
|
|
return 0;
|
|
}
|
|
|
|
static struct ds1wm_driver_data ds1wm_pdata = {
|
|
.active_high = 0,
|
|
};
|
|
|
|
static struct resource ds1wm_resources[] __initdata = {
|
|
[0] = {
|
|
.start = 0,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
[1] = {
|
|
.start = 0,
|
|
.end = 0,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
};
|
|
|
|
static struct mfd_cell ds1wm_cell __initdata = {
|
|
.name = "ds1wm",
|
|
.enable = ds1wm_enable,
|
|
.disable = ds1wm_disable,
|
|
.driver_data = &ds1wm_pdata,
|
|
.num_resources = 2,
|
|
.resources = ds1wm_resources,
|
|
};
|
|
|
|
static int __init pasic3_probe(struct platform_device *pdev)
|
|
{
|
|
struct pasic3_platform_data *pdata = pdev->dev.platform_data;
|
|
struct device *dev = &pdev->dev;
|
|
struct pasic3_data *asic;
|
|
struct resource *r;
|
|
int ret;
|
|
int irq = 0;
|
|
|
|
r = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
|
|
if (r) {
|
|
ds1wm_resources[1].flags = IORESOURCE_IRQ | (r->flags &
|
|
(IORESOURCE_IRQ_HIGHEDGE | IORESOURCE_IRQ_LOWEDGE));
|
|
irq = r->start;
|
|
}
|
|
|
|
r = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
|
|
if (r) {
|
|
ds1wm_resources[1].flags = IORESOURCE_IRQ | (r->flags &
|
|
(IORESOURCE_IRQ_HIGHEDGE | IORESOURCE_IRQ_LOWEDGE));
|
|
irq = r->start;
|
|
}
|
|
|
|
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
if (!r)
|
|
return -ENXIO;
|
|
|
|
if (!request_mem_region(r->start, resource_size(r), "pasic3"))
|
|
return -EBUSY;
|
|
|
|
asic = kzalloc(sizeof(struct pasic3_data), GFP_KERNEL);
|
|
if (!asic)
|
|
return -ENOMEM;
|
|
|
|
platform_set_drvdata(pdev, asic);
|
|
|
|
asic->mapping = ioremap(r->start, resource_size(r));
|
|
if (!asic->mapping) {
|
|
dev_err(dev, "couldn't ioremap PASIC3\n");
|
|
kfree(asic);
|
|
return -ENOMEM;
|
|
}
|
|
|
|
/* calculate bus shift from mem resource */
|
|
asic->bus_shift = (resource_size(r) - 5) >> 3;
|
|
|
|
if (pdata && pdata->clock_rate) {
|
|
ds1wm_pdata.clock_rate = pdata->clock_rate;
|
|
/* the first 5 PASIC3 registers control the DS1WM */
|
|
ds1wm_resources[0].end = (5 << asic->bus_shift) - 1;
|
|
ds1wm_cell.platform_data = &ds1wm_cell;
|
|
ds1wm_cell.data_size = sizeof(ds1wm_cell);
|
|
ret = mfd_add_devices(&pdev->dev, pdev->id,
|
|
&ds1wm_cell, 1, r, irq);
|
|
if (ret < 0)
|
|
dev_warn(dev, "failed to register DS1WM\n");
|
|
}
|
|
|
|
if (pdata && pdata->led_pdata) {
|
|
led_cell.driver_data = pdata->led_pdata;
|
|
led_cell.platform_data = &led_cell;
|
|
led_cell.data_size = sizeof(ds1wm_cell);
|
|
ret = mfd_add_devices(&pdev->dev, pdev->id, &led_cell, 1, r, 0);
|
|
if (ret < 0)
|
|
dev_warn(dev, "failed to register LED device\n");
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int pasic3_remove(struct platform_device *pdev)
|
|
{
|
|
struct pasic3_data *asic = platform_get_drvdata(pdev);
|
|
struct resource *r;
|
|
|
|
mfd_remove_devices(&pdev->dev);
|
|
|
|
iounmap(asic->mapping);
|
|
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
release_mem_region(r->start, resource_size(r));
|
|
kfree(asic);
|
|
return 0;
|
|
}
|
|
|
|
MODULE_ALIAS("platform:pasic3");
|
|
|
|
static struct platform_driver pasic3_driver = {
|
|
.driver = {
|
|
.name = "pasic3",
|
|
},
|
|
.remove = pasic3_remove,
|
|
};
|
|
|
|
static int __init pasic3_base_init(void)
|
|
{
|
|
return platform_driver_probe(&pasic3_driver, pasic3_probe);
|
|
}
|
|
|
|
static void __exit pasic3_base_exit(void)
|
|
{
|
|
platform_driver_unregister(&pasic3_driver);
|
|
}
|
|
|
|
module_init(pasic3_base_init);
|
|
module_exit(pasic3_base_exit);
|
|
|
|
MODULE_AUTHOR("Philipp Zabel <philipp.zabel@gmail.com>");
|
|
MODULE_DESCRIPTION("Core driver for HTC PASIC3");
|
|
MODULE_LICENSE("GPL");
|