mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +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>
266 lines
6.3 KiB
C
266 lines
6.3 KiB
C
/*
|
|
* wm831x-isink.c -- Current sink driver for the WM831x series
|
|
*
|
|
* Copyright 2009 Wolfson Microelectronics PLC.
|
|
*
|
|
* Author: Mark Brown <broonie@opensource.wolfsonmicro.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; either version 2 of the License, or (at your
|
|
* option) any later version.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/moduleparam.h>
|
|
#include <linux/init.h>
|
|
#include <linux/bitops.h>
|
|
#include <linux/err.h>
|
|
#include <linux/i2c.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/regulator/driver.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/mfd/wm831x/core.h>
|
|
#include <linux/mfd/wm831x/regulator.h>
|
|
#include <linux/mfd/wm831x/pdata.h>
|
|
|
|
#define WM831X_ISINK_MAX_NAME 7
|
|
|
|
struct wm831x_isink {
|
|
char name[WM831X_ISINK_MAX_NAME];
|
|
struct regulator_desc desc;
|
|
int reg;
|
|
struct wm831x *wm831x;
|
|
struct regulator_dev *regulator;
|
|
};
|
|
|
|
static int wm831x_isink_enable(struct regulator_dev *rdev)
|
|
{
|
|
struct wm831x_isink *isink = rdev_get_drvdata(rdev);
|
|
struct wm831x *wm831x = isink->wm831x;
|
|
int ret;
|
|
|
|
/* We have a two stage enable: first start the ISINK... */
|
|
ret = wm831x_set_bits(wm831x, isink->reg, WM831X_CS1_ENA,
|
|
WM831X_CS1_ENA);
|
|
if (ret != 0)
|
|
return ret;
|
|
|
|
/* ...then enable drive */
|
|
ret = wm831x_set_bits(wm831x, isink->reg, WM831X_CS1_DRIVE,
|
|
WM831X_CS1_DRIVE);
|
|
if (ret != 0)
|
|
wm831x_set_bits(wm831x, isink->reg, WM831X_CS1_ENA, 0);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
static int wm831x_isink_disable(struct regulator_dev *rdev)
|
|
{
|
|
struct wm831x_isink *isink = rdev_get_drvdata(rdev);
|
|
struct wm831x *wm831x = isink->wm831x;
|
|
int ret;
|
|
|
|
ret = wm831x_set_bits(wm831x, isink->reg, WM831X_CS1_DRIVE, 0);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
ret = wm831x_set_bits(wm831x, isink->reg, WM831X_CS1_ENA, 0);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
static int wm831x_isink_is_enabled(struct regulator_dev *rdev)
|
|
{
|
|
struct wm831x_isink *isink = rdev_get_drvdata(rdev);
|
|
struct wm831x *wm831x = isink->wm831x;
|
|
int ret;
|
|
|
|
ret = wm831x_reg_read(wm831x, isink->reg);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
if ((ret & (WM831X_CS1_ENA | WM831X_CS1_DRIVE)) ==
|
|
(WM831X_CS1_ENA | WM831X_CS1_DRIVE))
|
|
return 1;
|
|
else
|
|
return 0;
|
|
}
|
|
|
|
static int wm831x_isink_set_current(struct regulator_dev *rdev,
|
|
int min_uA, int max_uA)
|
|
{
|
|
struct wm831x_isink *isink = rdev_get_drvdata(rdev);
|
|
struct wm831x *wm831x = isink->wm831x;
|
|
int ret, i;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(wm831x_isinkv_values); i++) {
|
|
int val = wm831x_isinkv_values[i];
|
|
if (min_uA >= val && val <= max_uA) {
|
|
ret = wm831x_set_bits(wm831x, isink->reg,
|
|
WM831X_CS1_ISEL_MASK, i);
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
return -EINVAL;
|
|
}
|
|
|
|
static int wm831x_isink_get_current(struct regulator_dev *rdev)
|
|
{
|
|
struct wm831x_isink *isink = rdev_get_drvdata(rdev);
|
|
struct wm831x *wm831x = isink->wm831x;
|
|
int ret;
|
|
|
|
ret = wm831x_reg_read(wm831x, isink->reg);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
ret &= WM831X_CS1_ISEL_MASK;
|
|
if (ret > WM831X_ISINK_MAX_ISEL)
|
|
ret = WM831X_ISINK_MAX_ISEL;
|
|
|
|
return wm831x_isinkv_values[ret];
|
|
}
|
|
|
|
static struct regulator_ops wm831x_isink_ops = {
|
|
.is_enabled = wm831x_isink_is_enabled,
|
|
.enable = wm831x_isink_enable,
|
|
.disable = wm831x_isink_disable,
|
|
.set_current_limit = wm831x_isink_set_current,
|
|
.get_current_limit = wm831x_isink_get_current,
|
|
};
|
|
|
|
static irqreturn_t wm831x_isink_irq(int irq, void *data)
|
|
{
|
|
struct wm831x_isink *isink = data;
|
|
|
|
regulator_notifier_call_chain(isink->regulator,
|
|
REGULATOR_EVENT_OVER_CURRENT,
|
|
NULL);
|
|
|
|
return IRQ_HANDLED;
|
|
}
|
|
|
|
|
|
static __devinit int wm831x_isink_probe(struct platform_device *pdev)
|
|
{
|
|
struct wm831x *wm831x = dev_get_drvdata(pdev->dev.parent);
|
|
struct wm831x_pdata *pdata = wm831x->dev->platform_data;
|
|
struct wm831x_isink *isink;
|
|
int id = pdev->id % ARRAY_SIZE(pdata->isink);
|
|
struct resource *res;
|
|
int ret, irq;
|
|
|
|
dev_dbg(&pdev->dev, "Probing ISINK%d\n", id + 1);
|
|
|
|
if (pdata == NULL || pdata->isink[id] == NULL)
|
|
return -ENODEV;
|
|
|
|
isink = kzalloc(sizeof(struct wm831x_isink), GFP_KERNEL);
|
|
if (isink == NULL) {
|
|
dev_err(&pdev->dev, "Unable to allocate private data\n");
|
|
return -ENOMEM;
|
|
}
|
|
|
|
isink->wm831x = wm831x;
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_IO, 0);
|
|
if (res == NULL) {
|
|
dev_err(&pdev->dev, "No I/O resource\n");
|
|
ret = -EINVAL;
|
|
goto err;
|
|
}
|
|
isink->reg = res->start;
|
|
|
|
/* For current parts this is correct; probably need to revisit
|
|
* in future.
|
|
*/
|
|
snprintf(isink->name, sizeof(isink->name), "ISINK%d", id + 1);
|
|
isink->desc.name = isink->name;
|
|
isink->desc.id = id;
|
|
isink->desc.ops = &wm831x_isink_ops;
|
|
isink->desc.type = REGULATOR_CURRENT;
|
|
isink->desc.owner = THIS_MODULE;
|
|
|
|
isink->regulator = regulator_register(&isink->desc, &pdev->dev,
|
|
pdata->isink[id], isink);
|
|
if (IS_ERR(isink->regulator)) {
|
|
ret = PTR_ERR(isink->regulator);
|
|
dev_err(wm831x->dev, "Failed to register ISINK%d: %d\n",
|
|
id + 1, ret);
|
|
goto err;
|
|
}
|
|
|
|
irq = platform_get_irq(pdev, 0);
|
|
ret = wm831x_request_irq(wm831x, irq, wm831x_isink_irq,
|
|
IRQF_TRIGGER_RISING, isink->name,
|
|
isink);
|
|
if (ret != 0) {
|
|
dev_err(&pdev->dev, "Failed to request ISINK IRQ %d: %d\n",
|
|
irq, ret);
|
|
goto err_regulator;
|
|
}
|
|
|
|
platform_set_drvdata(pdev, isink);
|
|
|
|
return 0;
|
|
|
|
err_regulator:
|
|
regulator_unregister(isink->regulator);
|
|
err:
|
|
kfree(isink);
|
|
return ret;
|
|
}
|
|
|
|
static __devexit int wm831x_isink_remove(struct platform_device *pdev)
|
|
{
|
|
struct wm831x_isink *isink = platform_get_drvdata(pdev);
|
|
struct wm831x *wm831x = isink->wm831x;
|
|
|
|
platform_set_drvdata(pdev, NULL);
|
|
|
|
wm831x_free_irq(wm831x, platform_get_irq(pdev, 0), isink);
|
|
|
|
regulator_unregister(isink->regulator);
|
|
kfree(isink);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct platform_driver wm831x_isink_driver = {
|
|
.probe = wm831x_isink_probe,
|
|
.remove = __devexit_p(wm831x_isink_remove),
|
|
.driver = {
|
|
.name = "wm831x-isink",
|
|
.owner = THIS_MODULE,
|
|
},
|
|
};
|
|
|
|
static int __init wm831x_isink_init(void)
|
|
{
|
|
int ret;
|
|
ret = platform_driver_register(&wm831x_isink_driver);
|
|
if (ret != 0)
|
|
pr_err("Failed to register WM831x ISINK driver: %d\n", ret);
|
|
|
|
return ret;
|
|
}
|
|
subsys_initcall(wm831x_isink_init);
|
|
|
|
static void __exit wm831x_isink_exit(void)
|
|
{
|
|
platform_driver_unregister(&wm831x_isink_driver);
|
|
}
|
|
module_exit(wm831x_isink_exit);
|
|
|
|
/* Module information */
|
|
MODULE_AUTHOR("Mark Brown");
|
|
MODULE_DESCRIPTION("WM831x current sink driver");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_ALIAS("platform:wm831x-isink");
|