mirror of
https://github.com/torvalds/linux.git
synced 2024-11-25 05:32:00 +00: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>
238 lines
5.4 KiB
C
238 lines
5.4 KiB
C
/*
|
|
* I2C driver for Marvell 88PM860x
|
|
*
|
|
* Copyright (C) 2009 Marvell International Ltd.
|
|
* Haojian Zhuang <haojian.zhuang@marvell.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/i2c.h>
|
|
#include <linux/mfd/88pm860x.h>
|
|
#include <linux/slab.h>
|
|
|
|
static inline int pm860x_read_device(struct i2c_client *i2c,
|
|
int reg, int bytes, void *dest)
|
|
{
|
|
unsigned char data;
|
|
int ret;
|
|
|
|
data = (unsigned char)reg;
|
|
ret = i2c_master_send(i2c, &data, 1);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
ret = i2c_master_recv(i2c, dest, bytes);
|
|
if (ret < 0)
|
|
return ret;
|
|
return 0;
|
|
}
|
|
|
|
static inline int pm860x_write_device(struct i2c_client *i2c,
|
|
int reg, int bytes, void *src)
|
|
{
|
|
unsigned char buf[bytes + 1];
|
|
int ret;
|
|
|
|
buf[0] = (unsigned char)reg;
|
|
memcpy(&buf[1], src, bytes);
|
|
|
|
ret = i2c_master_send(i2c, buf, bytes + 1);
|
|
if (ret < 0)
|
|
return ret;
|
|
return 0;
|
|
}
|
|
|
|
int pm860x_reg_read(struct i2c_client *i2c, int reg)
|
|
{
|
|
struct pm860x_chip *chip = i2c_get_clientdata(i2c);
|
|
unsigned char data;
|
|
int ret;
|
|
|
|
mutex_lock(&chip->io_lock);
|
|
ret = pm860x_read_device(i2c, reg, 1, &data);
|
|
mutex_unlock(&chip->io_lock);
|
|
|
|
if (ret < 0)
|
|
return ret;
|
|
else
|
|
return (int)data;
|
|
}
|
|
EXPORT_SYMBOL(pm860x_reg_read);
|
|
|
|
int pm860x_reg_write(struct i2c_client *i2c, int reg,
|
|
unsigned char data)
|
|
{
|
|
struct pm860x_chip *chip = i2c_get_clientdata(i2c);
|
|
int ret;
|
|
|
|
mutex_lock(&chip->io_lock);
|
|
ret = pm860x_write_device(i2c, reg, 1, &data);
|
|
mutex_unlock(&chip->io_lock);
|
|
|
|
return ret;
|
|
}
|
|
EXPORT_SYMBOL(pm860x_reg_write);
|
|
|
|
int pm860x_bulk_read(struct i2c_client *i2c, int reg,
|
|
int count, unsigned char *buf)
|
|
{
|
|
struct pm860x_chip *chip = i2c_get_clientdata(i2c);
|
|
int ret;
|
|
|
|
mutex_lock(&chip->io_lock);
|
|
ret = pm860x_read_device(i2c, reg, count, buf);
|
|
mutex_unlock(&chip->io_lock);
|
|
|
|
return ret;
|
|
}
|
|
EXPORT_SYMBOL(pm860x_bulk_read);
|
|
|
|
int pm860x_bulk_write(struct i2c_client *i2c, int reg,
|
|
int count, unsigned char *buf)
|
|
{
|
|
struct pm860x_chip *chip = i2c_get_clientdata(i2c);
|
|
int ret;
|
|
|
|
mutex_lock(&chip->io_lock);
|
|
ret = pm860x_write_device(i2c, reg, count, buf);
|
|
mutex_unlock(&chip->io_lock);
|
|
|
|
return ret;
|
|
}
|
|
EXPORT_SYMBOL(pm860x_bulk_write);
|
|
|
|
int pm860x_set_bits(struct i2c_client *i2c, int reg,
|
|
unsigned char mask, unsigned char data)
|
|
{
|
|
struct pm860x_chip *chip = i2c_get_clientdata(i2c);
|
|
unsigned char value;
|
|
int ret;
|
|
|
|
mutex_lock(&chip->io_lock);
|
|
ret = pm860x_read_device(i2c, reg, 1, &value);
|
|
if (ret < 0)
|
|
goto out;
|
|
value &= ~mask;
|
|
value |= data;
|
|
ret = pm860x_write_device(i2c, reg, 1, &value);
|
|
out:
|
|
mutex_unlock(&chip->io_lock);
|
|
return ret;
|
|
}
|
|
EXPORT_SYMBOL(pm860x_set_bits);
|
|
|
|
|
|
static const struct i2c_device_id pm860x_id_table[] = {
|
|
{ "88PM860x", 0 },
|
|
{}
|
|
};
|
|
MODULE_DEVICE_TABLE(i2c, pm860x_id_table);
|
|
|
|
static int verify_addr(struct i2c_client *i2c)
|
|
{
|
|
unsigned short addr_8607[] = {0x30, 0x34};
|
|
unsigned short addr_8606[] = {0x10, 0x11};
|
|
int size, i;
|
|
|
|
if (i2c == NULL)
|
|
return 0;
|
|
size = ARRAY_SIZE(addr_8606);
|
|
for (i = 0; i < size; i++) {
|
|
if (i2c->addr == *(addr_8606 + i))
|
|
return CHIP_PM8606;
|
|
}
|
|
size = ARRAY_SIZE(addr_8607);
|
|
for (i = 0; i < size; i++) {
|
|
if (i2c->addr == *(addr_8607 + i))
|
|
return CHIP_PM8607;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static int __devinit pm860x_probe(struct i2c_client *client,
|
|
const struct i2c_device_id *id)
|
|
{
|
|
struct pm860x_platform_data *pdata = client->dev.platform_data;
|
|
struct pm860x_chip *chip;
|
|
|
|
if (!pdata) {
|
|
pr_info("No platform data in %s!\n", __func__);
|
|
return -EINVAL;
|
|
}
|
|
|
|
chip = kzalloc(sizeof(struct pm860x_chip), GFP_KERNEL);
|
|
if (chip == NULL)
|
|
return -ENOMEM;
|
|
|
|
chip->id = verify_addr(client);
|
|
chip->client = client;
|
|
i2c_set_clientdata(client, chip);
|
|
chip->dev = &client->dev;
|
|
mutex_init(&chip->io_lock);
|
|
dev_set_drvdata(chip->dev, chip);
|
|
|
|
/*
|
|
* Both client and companion client shares same platform driver.
|
|
* Driver distinguishes them by pdata->companion_addr.
|
|
* pdata->companion_addr is only assigned if companion chip exists.
|
|
* At the same time, the companion_addr shouldn't equal to client
|
|
* address.
|
|
*/
|
|
if (pdata->companion_addr && (pdata->companion_addr != client->addr)) {
|
|
chip->companion_addr = pdata->companion_addr;
|
|
chip->companion = i2c_new_dummy(chip->client->adapter,
|
|
chip->companion_addr);
|
|
i2c_set_clientdata(chip->companion, chip);
|
|
}
|
|
|
|
pm860x_device_init(chip, pdata);
|
|
return 0;
|
|
}
|
|
|
|
static int __devexit pm860x_remove(struct i2c_client *client)
|
|
{
|
|
struct pm860x_chip *chip = i2c_get_clientdata(client);
|
|
|
|
pm860x_device_exit(chip);
|
|
i2c_unregister_device(chip->companion);
|
|
i2c_set_clientdata(chip->companion, NULL);
|
|
i2c_set_clientdata(chip->client, NULL);
|
|
kfree(chip);
|
|
return 0;
|
|
}
|
|
|
|
static struct i2c_driver pm860x_driver = {
|
|
.driver = {
|
|
.name = "88PM860x",
|
|
.owner = THIS_MODULE,
|
|
},
|
|
.probe = pm860x_probe,
|
|
.remove = __devexit_p(pm860x_remove),
|
|
.id_table = pm860x_id_table,
|
|
};
|
|
|
|
static int __init pm860x_i2c_init(void)
|
|
{
|
|
int ret;
|
|
ret = i2c_add_driver(&pm860x_driver);
|
|
if (ret != 0)
|
|
pr_err("Failed to register 88PM860x I2C driver: %d\n", ret);
|
|
return ret;
|
|
}
|
|
subsys_initcall(pm860x_i2c_init);
|
|
|
|
static void __exit pm860x_i2c_exit(void)
|
|
{
|
|
i2c_del_driver(&pm860x_driver);
|
|
}
|
|
module_exit(pm860x_i2c_exit);
|
|
|
|
MODULE_DESCRIPTION("I2C Driver for Marvell 88PM860x");
|
|
MODULE_AUTHOR("Haojian Zhuang <haojian.zhuang@marvell.com>");
|
|
MODULE_LICENSE("GPL");
|