mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +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>
317 lines
8.1 KiB
C
317 lines
8.1 KiB
C
/*
|
|
* An hwmon driver for the Analog Devices AD7416/17/18
|
|
* Copyright (C) 2006-07 Tower Technologies
|
|
*
|
|
* Author: Alessandro Zummo <a.zummo@towertech.it>
|
|
*
|
|
* Based on lm75.c
|
|
* Copyright (C) 1998-99 Frodo Looijaard <frodol@dds.nl>
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/jiffies.h>
|
|
#include <linux/i2c.h>
|
|
#include <linux/hwmon.h>
|
|
#include <linux/hwmon-sysfs.h>
|
|
#include <linux/err.h>
|
|
#include <linux/mutex.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include "lm75.h"
|
|
|
|
#define DRV_VERSION "0.4"
|
|
|
|
enum chips { ad7416, ad7417, ad7418 };
|
|
|
|
/* AD7418 registers */
|
|
#define AD7418_REG_TEMP_IN 0x00
|
|
#define AD7418_REG_CONF 0x01
|
|
#define AD7418_REG_TEMP_HYST 0x02
|
|
#define AD7418_REG_TEMP_OS 0x03
|
|
#define AD7418_REG_ADC 0x04
|
|
#define AD7418_REG_CONF2 0x05
|
|
|
|
#define AD7418_REG_ADC_CH(x) ((x) << 5)
|
|
#define AD7418_CH_TEMP AD7418_REG_ADC_CH(0)
|
|
|
|
static const u8 AD7418_REG_TEMP[] = { AD7418_REG_TEMP_IN,
|
|
AD7418_REG_TEMP_HYST,
|
|
AD7418_REG_TEMP_OS };
|
|
|
|
struct ad7418_data {
|
|
struct device *hwmon_dev;
|
|
struct attribute_group attrs;
|
|
enum chips type;
|
|
struct mutex lock;
|
|
int adc_max; /* number of ADC channels */
|
|
char valid;
|
|
unsigned long last_updated; /* In jiffies */
|
|
s16 temp[3]; /* Register values */
|
|
u16 in[4];
|
|
};
|
|
|
|
static int ad7418_probe(struct i2c_client *client,
|
|
const struct i2c_device_id *id);
|
|
static int ad7418_remove(struct i2c_client *client);
|
|
|
|
static const struct i2c_device_id ad7418_id[] = {
|
|
{ "ad7416", ad7416 },
|
|
{ "ad7417", ad7417 },
|
|
{ "ad7418", ad7418 },
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(i2c, ad7418_id);
|
|
|
|
static struct i2c_driver ad7418_driver = {
|
|
.driver = {
|
|
.name = "ad7418",
|
|
},
|
|
.probe = ad7418_probe,
|
|
.remove = ad7418_remove,
|
|
.id_table = ad7418_id,
|
|
};
|
|
|
|
/* All registers are word-sized, except for the configuration registers.
|
|
* AD7418 uses a high-byte first convention. Do NOT use those functions to
|
|
* access the configuration registers CONF and CONF2, as they are byte-sized.
|
|
*/
|
|
static inline int ad7418_read(struct i2c_client *client, u8 reg)
|
|
{
|
|
return swab16(i2c_smbus_read_word_data(client, reg));
|
|
}
|
|
|
|
static inline int ad7418_write(struct i2c_client *client, u8 reg, u16 value)
|
|
{
|
|
return i2c_smbus_write_word_data(client, reg, swab16(value));
|
|
}
|
|
|
|
static void ad7418_init_client(struct i2c_client *client)
|
|
{
|
|
struct ad7418_data *data = i2c_get_clientdata(client);
|
|
|
|
int reg = i2c_smbus_read_byte_data(client, AD7418_REG_CONF);
|
|
if (reg < 0) {
|
|
dev_err(&client->dev, "cannot read configuration register\n");
|
|
} else {
|
|
dev_info(&client->dev, "configuring for mode 1\n");
|
|
i2c_smbus_write_byte_data(client, AD7418_REG_CONF, reg & 0xfe);
|
|
|
|
if (data->type == ad7417 || data->type == ad7418)
|
|
i2c_smbus_write_byte_data(client,
|
|
AD7418_REG_CONF2, 0x00);
|
|
}
|
|
}
|
|
|
|
static struct ad7418_data *ad7418_update_device(struct device *dev)
|
|
{
|
|
struct i2c_client *client = to_i2c_client(dev);
|
|
struct ad7418_data *data = i2c_get_clientdata(client);
|
|
|
|
mutex_lock(&data->lock);
|
|
|
|
if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
|
|
|| !data->valid) {
|
|
u8 cfg;
|
|
int i, ch;
|
|
|
|
/* read config register and clear channel bits */
|
|
cfg = i2c_smbus_read_byte_data(client, AD7418_REG_CONF);
|
|
cfg &= 0x1F;
|
|
|
|
i2c_smbus_write_byte_data(client, AD7418_REG_CONF,
|
|
cfg | AD7418_CH_TEMP);
|
|
udelay(30);
|
|
|
|
for (i = 0; i < 3; i++) {
|
|
data->temp[i] = ad7418_read(client, AD7418_REG_TEMP[i]);
|
|
}
|
|
|
|
for (i = 0, ch = 4; i < data->adc_max; i++, ch--) {
|
|
i2c_smbus_write_byte_data(client,
|
|
AD7418_REG_CONF,
|
|
cfg | AD7418_REG_ADC_CH(ch));
|
|
|
|
udelay(15);
|
|
data->in[data->adc_max - 1 - i] =
|
|
ad7418_read(client, AD7418_REG_ADC);
|
|
}
|
|
|
|
/* restore old configuration value */
|
|
ad7418_write(client, AD7418_REG_CONF, cfg);
|
|
|
|
data->last_updated = jiffies;
|
|
data->valid = 1;
|
|
}
|
|
|
|
mutex_unlock(&data->lock);
|
|
|
|
return data;
|
|
}
|
|
|
|
static ssize_t show_temp(struct device *dev, struct device_attribute *devattr,
|
|
char *buf)
|
|
{
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
|
struct ad7418_data *data = ad7418_update_device(dev);
|
|
return sprintf(buf, "%d\n",
|
|
LM75_TEMP_FROM_REG(data->temp[attr->index]));
|
|
}
|
|
|
|
static ssize_t show_adc(struct device *dev, struct device_attribute *devattr,
|
|
char *buf)
|
|
{
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
|
struct ad7418_data *data = ad7418_update_device(dev);
|
|
|
|
return sprintf(buf, "%d\n",
|
|
((data->in[attr->index] >> 6) * 2500 + 512) / 1024);
|
|
}
|
|
|
|
static ssize_t set_temp(struct device *dev, struct device_attribute *devattr,
|
|
const char *buf, size_t count)
|
|
{
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
|
struct i2c_client *client = to_i2c_client(dev);
|
|
struct ad7418_data *data = i2c_get_clientdata(client);
|
|
long temp = simple_strtol(buf, NULL, 10);
|
|
|
|
mutex_lock(&data->lock);
|
|
data->temp[attr->index] = LM75_TEMP_TO_REG(temp);
|
|
ad7418_write(client, AD7418_REG_TEMP[attr->index], data->temp[attr->index]);
|
|
mutex_unlock(&data->lock);
|
|
return count;
|
|
}
|
|
|
|
static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);
|
|
static SENSOR_DEVICE_ATTR(temp1_max_hyst, S_IWUSR | S_IRUGO,
|
|
show_temp, set_temp, 1);
|
|
static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO,
|
|
show_temp, set_temp, 2);
|
|
|
|
static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, show_adc, NULL, 0);
|
|
static SENSOR_DEVICE_ATTR(in2_input, S_IRUGO, show_adc, NULL, 1);
|
|
static SENSOR_DEVICE_ATTR(in3_input, S_IRUGO, show_adc, NULL, 2);
|
|
static SENSOR_DEVICE_ATTR(in4_input, S_IRUGO, show_adc, NULL, 3);
|
|
|
|
static struct attribute *ad7416_attributes[] = {
|
|
&sensor_dev_attr_temp1_max.dev_attr.attr,
|
|
&sensor_dev_attr_temp1_max_hyst.dev_attr.attr,
|
|
&sensor_dev_attr_temp1_input.dev_attr.attr,
|
|
NULL
|
|
};
|
|
|
|
static struct attribute *ad7417_attributes[] = {
|
|
&sensor_dev_attr_temp1_max.dev_attr.attr,
|
|
&sensor_dev_attr_temp1_max_hyst.dev_attr.attr,
|
|
&sensor_dev_attr_temp1_input.dev_attr.attr,
|
|
&sensor_dev_attr_in1_input.dev_attr.attr,
|
|
&sensor_dev_attr_in2_input.dev_attr.attr,
|
|
&sensor_dev_attr_in3_input.dev_attr.attr,
|
|
&sensor_dev_attr_in4_input.dev_attr.attr,
|
|
NULL
|
|
};
|
|
|
|
static struct attribute *ad7418_attributes[] = {
|
|
&sensor_dev_attr_temp1_max.dev_attr.attr,
|
|
&sensor_dev_attr_temp1_max_hyst.dev_attr.attr,
|
|
&sensor_dev_attr_temp1_input.dev_attr.attr,
|
|
&sensor_dev_attr_in1_input.dev_attr.attr,
|
|
NULL
|
|
};
|
|
|
|
static int ad7418_probe(struct i2c_client *client,
|
|
const struct i2c_device_id *id)
|
|
{
|
|
struct i2c_adapter *adapter = client->adapter;
|
|
struct ad7418_data *data;
|
|
int err;
|
|
|
|
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA |
|
|
I2C_FUNC_SMBUS_WORD_DATA)) {
|
|
err = -EOPNOTSUPP;
|
|
goto exit;
|
|
}
|
|
|
|
if (!(data = kzalloc(sizeof(struct ad7418_data), GFP_KERNEL))) {
|
|
err = -ENOMEM;
|
|
goto exit;
|
|
}
|
|
|
|
i2c_set_clientdata(client, data);
|
|
|
|
mutex_init(&data->lock);
|
|
data->type = id->driver_data;
|
|
|
|
switch (data->type) {
|
|
case ad7416:
|
|
data->adc_max = 0;
|
|
data->attrs.attrs = ad7416_attributes;
|
|
break;
|
|
|
|
case ad7417:
|
|
data->adc_max = 4;
|
|
data->attrs.attrs = ad7417_attributes;
|
|
break;
|
|
|
|
case ad7418:
|
|
data->adc_max = 1;
|
|
data->attrs.attrs = ad7418_attributes;
|
|
break;
|
|
}
|
|
|
|
dev_info(&client->dev, "%s chip found\n", client->name);
|
|
|
|
/* Initialize the AD7418 chip */
|
|
ad7418_init_client(client);
|
|
|
|
/* Register sysfs hooks */
|
|
if ((err = sysfs_create_group(&client->dev.kobj, &data->attrs)))
|
|
goto exit_free;
|
|
|
|
data->hwmon_dev = hwmon_device_register(&client->dev);
|
|
if (IS_ERR(data->hwmon_dev)) {
|
|
err = PTR_ERR(data->hwmon_dev);
|
|
goto exit_remove;
|
|
}
|
|
|
|
return 0;
|
|
|
|
exit_remove:
|
|
sysfs_remove_group(&client->dev.kobj, &data->attrs);
|
|
exit_free:
|
|
kfree(data);
|
|
exit:
|
|
return err;
|
|
}
|
|
|
|
static int ad7418_remove(struct i2c_client *client)
|
|
{
|
|
struct ad7418_data *data = i2c_get_clientdata(client);
|
|
hwmon_device_unregister(data->hwmon_dev);
|
|
sysfs_remove_group(&client->dev.kobj, &data->attrs);
|
|
kfree(data);
|
|
return 0;
|
|
}
|
|
|
|
static int __init ad7418_init(void)
|
|
{
|
|
return i2c_add_driver(&ad7418_driver);
|
|
}
|
|
|
|
static void __exit ad7418_exit(void)
|
|
{
|
|
i2c_del_driver(&ad7418_driver);
|
|
}
|
|
|
|
MODULE_AUTHOR("Alessandro Zummo <a.zummo@towertech.it>");
|
|
MODULE_DESCRIPTION("AD7416/17/18 driver");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_VERSION(DRV_VERSION);
|
|
|
|
module_init(ad7418_init);
|
|
module_exit(ad7418_exit);
|