mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 12:42:02 +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>
267 lines
6.9 KiB
C
267 lines
6.9 KiB
C
/*
|
|
* adcxx.c
|
|
*
|
|
* The adcxx4s is an AD converter family from National Semiconductor (NS).
|
|
*
|
|
* Copyright (c) 2008 Marc Pignat <marc.pignat@hevs.ch>
|
|
*
|
|
* The adcxx4s communicates with a host processor via an SPI/Microwire Bus
|
|
* interface. This driver supports the whole family of devices with name
|
|
* ADC<bb><c>S<sss>, where
|
|
* * bb is the resolution in number of bits (8, 10, 12)
|
|
* * c is the number of channels (1, 2, 4, 8)
|
|
* * sss is the maximum conversion speed (021 for 200 kSPS, 051 for 500 kSPS
|
|
* and 101 for 1 MSPS)
|
|
*
|
|
* Complete datasheets are available at National's website here:
|
|
* http://www.national.com/ds/DC/ADC<bb><c>S<sss>.pdf
|
|
*
|
|
* Handling of 8, 10 and 12 bits converters are the same, the
|
|
* unavailable bits are 0 :)
|
|
*
|
|
* 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.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/module.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/device.h>
|
|
#include <linux/err.h>
|
|
#include <linux/sysfs.h>
|
|
#include <linux/hwmon.h>
|
|
#include <linux/hwmon-sysfs.h>
|
|
#include <linux/mutex.h>
|
|
#include <linux/mod_devicetable.h>
|
|
#include <linux/spi/spi.h>
|
|
|
|
#define DRVNAME "adcxx"
|
|
|
|
struct adcxx {
|
|
struct device *hwmon_dev;
|
|
struct mutex lock;
|
|
u32 channels;
|
|
u32 reference; /* in millivolts */
|
|
};
|
|
|
|
/* sysfs hook function */
|
|
static ssize_t adcxx_read(struct device *dev,
|
|
struct device_attribute *devattr, char *buf)
|
|
{
|
|
struct spi_device *spi = to_spi_device(dev);
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
|
struct adcxx *adc = dev_get_drvdata(&spi->dev);
|
|
u8 tx_buf[2];
|
|
u8 rx_buf[2];
|
|
int status;
|
|
u32 value;
|
|
|
|
if (mutex_lock_interruptible(&adc->lock))
|
|
return -ERESTARTSYS;
|
|
|
|
if (adc->channels == 1) {
|
|
status = spi_read(spi, rx_buf, sizeof(rx_buf));
|
|
} else {
|
|
tx_buf[0] = attr->index << 3; /* other bits are don't care */
|
|
status = spi_write_then_read(spi, tx_buf, sizeof(tx_buf),
|
|
rx_buf, sizeof(rx_buf));
|
|
}
|
|
if (status < 0) {
|
|
dev_warn(dev, "SPI synch. transfer failed with status %d\n",
|
|
status);
|
|
goto out;
|
|
}
|
|
|
|
value = (rx_buf[0] << 8) + rx_buf[1];
|
|
dev_dbg(dev, "raw value = 0x%x\n", value);
|
|
|
|
value = value * adc->reference >> 12;
|
|
status = sprintf(buf, "%d\n", value);
|
|
out:
|
|
mutex_unlock(&adc->lock);
|
|
return status;
|
|
}
|
|
|
|
static ssize_t adcxx_show_min(struct device *dev,
|
|
struct device_attribute *devattr, char *buf)
|
|
{
|
|
/* The minimum reference is 0 for this chip family */
|
|
return sprintf(buf, "0\n");
|
|
}
|
|
|
|
static ssize_t adcxx_show_max(struct device *dev,
|
|
struct device_attribute *devattr, char *buf)
|
|
{
|
|
struct spi_device *spi = to_spi_device(dev);
|
|
struct adcxx *adc = dev_get_drvdata(&spi->dev);
|
|
u32 reference;
|
|
|
|
if (mutex_lock_interruptible(&adc->lock))
|
|
return -ERESTARTSYS;
|
|
|
|
reference = adc->reference;
|
|
|
|
mutex_unlock(&adc->lock);
|
|
|
|
return sprintf(buf, "%d\n", reference);
|
|
}
|
|
|
|
static ssize_t adcxx_set_max(struct device *dev,
|
|
struct device_attribute *devattr, const char *buf, size_t count)
|
|
{
|
|
struct spi_device *spi = to_spi_device(dev);
|
|
struct adcxx *adc = dev_get_drvdata(&spi->dev);
|
|
unsigned long value;
|
|
|
|
if (strict_strtoul(buf, 10, &value))
|
|
return -EINVAL;
|
|
|
|
if (mutex_lock_interruptible(&adc->lock))
|
|
return -ERESTARTSYS;
|
|
|
|
adc->reference = value;
|
|
|
|
mutex_unlock(&adc->lock);
|
|
|
|
return count;
|
|
}
|
|
|
|
static ssize_t adcxx_show_name(struct device *dev, struct device_attribute
|
|
*devattr, char *buf)
|
|
{
|
|
struct spi_device *spi = to_spi_device(dev);
|
|
struct adcxx *adc = dev_get_drvdata(&spi->dev);
|
|
|
|
return sprintf(buf, "adcxx%ds\n", adc->channels);
|
|
}
|
|
|
|
static struct sensor_device_attribute ad_input[] = {
|
|
SENSOR_ATTR(name, S_IRUGO, adcxx_show_name, NULL, 0),
|
|
SENSOR_ATTR(in_min, S_IRUGO, adcxx_show_min, NULL, 0),
|
|
SENSOR_ATTR(in_max, S_IWUSR | S_IRUGO, adcxx_show_max,
|
|
adcxx_set_max, 0),
|
|
SENSOR_ATTR(in0_input, S_IRUGO, adcxx_read, NULL, 0),
|
|
SENSOR_ATTR(in1_input, S_IRUGO, adcxx_read, NULL, 1),
|
|
SENSOR_ATTR(in2_input, S_IRUGO, adcxx_read, NULL, 2),
|
|
SENSOR_ATTR(in3_input, S_IRUGO, adcxx_read, NULL, 3),
|
|
SENSOR_ATTR(in4_input, S_IRUGO, adcxx_read, NULL, 4),
|
|
SENSOR_ATTR(in5_input, S_IRUGO, adcxx_read, NULL, 5),
|
|
SENSOR_ATTR(in6_input, S_IRUGO, adcxx_read, NULL, 6),
|
|
SENSOR_ATTR(in7_input, S_IRUGO, adcxx_read, NULL, 7),
|
|
};
|
|
|
|
/*----------------------------------------------------------------------*/
|
|
|
|
static int __devinit adcxx_probe(struct spi_device *spi)
|
|
{
|
|
int channels = spi_get_device_id(spi)->driver_data;
|
|
struct adcxx *adc;
|
|
int status;
|
|
int i;
|
|
|
|
adc = kzalloc(sizeof *adc, GFP_KERNEL);
|
|
if (!adc)
|
|
return -ENOMEM;
|
|
|
|
/* set a default value for the reference */
|
|
adc->reference = 3300;
|
|
adc->channels = channels;
|
|
mutex_init(&adc->lock);
|
|
|
|
mutex_lock(&adc->lock);
|
|
|
|
dev_set_drvdata(&spi->dev, adc);
|
|
|
|
for (i = 0; i < 3 + adc->channels; i++) {
|
|
status = device_create_file(&spi->dev, &ad_input[i].dev_attr);
|
|
if (status) {
|
|
dev_err(&spi->dev, "device_create_file failed.\n");
|
|
goto out_err;
|
|
}
|
|
}
|
|
|
|
adc->hwmon_dev = hwmon_device_register(&spi->dev);
|
|
if (IS_ERR(adc->hwmon_dev)) {
|
|
dev_err(&spi->dev, "hwmon_device_register failed.\n");
|
|
status = PTR_ERR(adc->hwmon_dev);
|
|
goto out_err;
|
|
}
|
|
|
|
mutex_unlock(&adc->lock);
|
|
return 0;
|
|
|
|
out_err:
|
|
for (i--; i >= 0; i--)
|
|
device_remove_file(&spi->dev, &ad_input[i].dev_attr);
|
|
|
|
dev_set_drvdata(&spi->dev, NULL);
|
|
mutex_unlock(&adc->lock);
|
|
kfree(adc);
|
|
return status;
|
|
}
|
|
|
|
static int __devexit adcxx_remove(struct spi_device *spi)
|
|
{
|
|
struct adcxx *adc = dev_get_drvdata(&spi->dev);
|
|
int i;
|
|
|
|
mutex_lock(&adc->lock);
|
|
hwmon_device_unregister(adc->hwmon_dev);
|
|
for (i = 0; i < 3 + adc->channels; i++)
|
|
device_remove_file(&spi->dev, &ad_input[i].dev_attr);
|
|
|
|
dev_set_drvdata(&spi->dev, NULL);
|
|
mutex_unlock(&adc->lock);
|
|
kfree(adc);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct spi_device_id adcxx_ids[] = {
|
|
{ "adcxx1s", 1 },
|
|
{ "adcxx2s", 2 },
|
|
{ "adcxx4s", 4 },
|
|
{ "adcxx8s", 8 },
|
|
{ },
|
|
};
|
|
MODULE_DEVICE_TABLE(spi, adcxx_ids);
|
|
|
|
static struct spi_driver adcxx_driver = {
|
|
.driver = {
|
|
.name = "adcxx",
|
|
.owner = THIS_MODULE,
|
|
},
|
|
.id_table = adcxx_ids,
|
|
.probe = adcxx_probe,
|
|
.remove = __devexit_p(adcxx_remove),
|
|
};
|
|
|
|
static int __init init_adcxx(void)
|
|
{
|
|
return spi_register_driver(&adcxx_driver);
|
|
}
|
|
|
|
static void __exit exit_adcxx(void)
|
|
{
|
|
spi_unregister_driver(&adcxx_driver);
|
|
}
|
|
|
|
module_init(init_adcxx);
|
|
module_exit(exit_adcxx);
|
|
|
|
MODULE_AUTHOR("Marc Pignat");
|
|
MODULE_DESCRIPTION("National Semiconductor adcxx8sxxx Linux driver");
|
|
MODULE_LICENSE("GPL");
|