mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +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>
193 lines
4.9 KiB
C
193 lines
4.9 KiB
C
/*
|
|
* rtc-ds1390.c -- driver for the Dallas/Maxim DS1390/93/94 SPI RTC
|
|
*
|
|
* Copyright (C) 2008 Mercury IMC Ltd
|
|
* Written by Mark Jackson <mpfj@mimc.co.uk>
|
|
*
|
|
* 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.
|
|
*
|
|
* NOTE: Currently this driver only supports the bare minimum for read
|
|
* and write the RTC. The extra features provided by the chip family
|
|
* (alarms, trickle charger, different control registers) are unavailable.
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/module.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/rtc.h>
|
|
#include <linux/spi/spi.h>
|
|
#include <linux/bcd.h>
|
|
#include <linux/slab.h>
|
|
|
|
#define DS1390_REG_100THS 0x00
|
|
#define DS1390_REG_SECONDS 0x01
|
|
#define DS1390_REG_MINUTES 0x02
|
|
#define DS1390_REG_HOURS 0x03
|
|
#define DS1390_REG_DAY 0x04
|
|
#define DS1390_REG_DATE 0x05
|
|
#define DS1390_REG_MONTH_CENT 0x06
|
|
#define DS1390_REG_YEAR 0x07
|
|
|
|
#define DS1390_REG_ALARM_100THS 0x08
|
|
#define DS1390_REG_ALARM_SECONDS 0x09
|
|
#define DS1390_REG_ALARM_MINUTES 0x0A
|
|
#define DS1390_REG_ALARM_HOURS 0x0B
|
|
#define DS1390_REG_ALARM_DAY_DATE 0x0C
|
|
|
|
#define DS1390_REG_CONTROL 0x0D
|
|
#define DS1390_REG_STATUS 0x0E
|
|
#define DS1390_REG_TRICKLE 0x0F
|
|
|
|
struct ds1390 {
|
|
struct rtc_device *rtc;
|
|
u8 txrx_buf[9]; /* cmd + 8 registers */
|
|
};
|
|
|
|
static int ds1390_get_reg(struct device *dev, unsigned char address,
|
|
unsigned char *data)
|
|
{
|
|
struct spi_device *spi = to_spi_device(dev);
|
|
struct ds1390 *chip = dev_get_drvdata(dev);
|
|
int status;
|
|
|
|
if (!data)
|
|
return -EINVAL;
|
|
|
|
/* Clear MSB to indicate read */
|
|
chip->txrx_buf[0] = address & 0x7f;
|
|
/* do the i/o */
|
|
status = spi_write_then_read(spi, chip->txrx_buf, 1, chip->txrx_buf, 1);
|
|
if (status != 0)
|
|
return status;
|
|
|
|
*data = chip->txrx_buf[1];
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int ds1390_read_time(struct device *dev, struct rtc_time *dt)
|
|
{
|
|
struct spi_device *spi = to_spi_device(dev);
|
|
struct ds1390 *chip = dev_get_drvdata(dev);
|
|
int status;
|
|
|
|
/* build the message */
|
|
chip->txrx_buf[0] = DS1390_REG_SECONDS;
|
|
|
|
/* do the i/o */
|
|
status = spi_write_then_read(spi, chip->txrx_buf, 1, chip->txrx_buf, 8);
|
|
if (status != 0)
|
|
return status;
|
|
|
|
/* The chip sends data in this order:
|
|
* Seconds, Minutes, Hours, Day, Date, Month / Century, Year */
|
|
dt->tm_sec = bcd2bin(chip->txrx_buf[0]);
|
|
dt->tm_min = bcd2bin(chip->txrx_buf[1]);
|
|
dt->tm_hour = bcd2bin(chip->txrx_buf[2]);
|
|
dt->tm_wday = bcd2bin(chip->txrx_buf[3]);
|
|
dt->tm_mday = bcd2bin(chip->txrx_buf[4]);
|
|
/* mask off century bit */
|
|
dt->tm_mon = bcd2bin(chip->txrx_buf[5] & 0x7f) - 1;
|
|
/* adjust for century bit */
|
|
dt->tm_year = bcd2bin(chip->txrx_buf[6]) + ((chip->txrx_buf[5] & 0x80) ? 100 : 0);
|
|
|
|
return rtc_valid_tm(dt);
|
|
}
|
|
|
|
static int ds1390_set_time(struct device *dev, struct rtc_time *dt)
|
|
{
|
|
struct spi_device *spi = to_spi_device(dev);
|
|
struct ds1390 *chip = dev_get_drvdata(dev);
|
|
|
|
/* build the message */
|
|
chip->txrx_buf[0] = DS1390_REG_SECONDS | 0x80;
|
|
chip->txrx_buf[1] = bin2bcd(dt->tm_sec);
|
|
chip->txrx_buf[2] = bin2bcd(dt->tm_min);
|
|
chip->txrx_buf[3] = bin2bcd(dt->tm_hour);
|
|
chip->txrx_buf[4] = bin2bcd(dt->tm_wday);
|
|
chip->txrx_buf[5] = bin2bcd(dt->tm_mday);
|
|
chip->txrx_buf[6] = bin2bcd(dt->tm_mon + 1) |
|
|
((dt->tm_year > 99) ? 0x80 : 0x00);
|
|
chip->txrx_buf[7] = bin2bcd(dt->tm_year % 100);
|
|
|
|
/* do the i/o */
|
|
return spi_write_then_read(spi, chip->txrx_buf, 8, NULL, 0);
|
|
}
|
|
|
|
static const struct rtc_class_ops ds1390_rtc_ops = {
|
|
.read_time = ds1390_read_time,
|
|
.set_time = ds1390_set_time,
|
|
};
|
|
|
|
static int __devinit ds1390_probe(struct spi_device *spi)
|
|
{
|
|
unsigned char tmp;
|
|
struct ds1390 *chip;
|
|
int res;
|
|
|
|
spi->mode = SPI_MODE_3;
|
|
spi->bits_per_word = 8;
|
|
spi_setup(spi);
|
|
|
|
chip = kzalloc(sizeof *chip, GFP_KERNEL);
|
|
if (!chip) {
|
|
dev_err(&spi->dev, "unable to allocate device memory\n");
|
|
return -ENOMEM;
|
|
}
|
|
dev_set_drvdata(&spi->dev, chip);
|
|
|
|
res = ds1390_get_reg(&spi->dev, DS1390_REG_SECONDS, &tmp);
|
|
if (res != 0) {
|
|
dev_err(&spi->dev, "unable to read device\n");
|
|
kfree(chip);
|
|
return res;
|
|
}
|
|
|
|
chip->rtc = rtc_device_register("ds1390",
|
|
&spi->dev, &ds1390_rtc_ops, THIS_MODULE);
|
|
if (IS_ERR(chip->rtc)) {
|
|
dev_err(&spi->dev, "unable to register device\n");
|
|
res = PTR_ERR(chip->rtc);
|
|
kfree(chip);
|
|
}
|
|
|
|
return res;
|
|
}
|
|
|
|
static int __devexit ds1390_remove(struct spi_device *spi)
|
|
{
|
|
struct ds1390 *chip = platform_get_drvdata(spi);
|
|
|
|
rtc_device_unregister(chip->rtc);
|
|
kfree(chip);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static struct spi_driver ds1390_driver = {
|
|
.driver = {
|
|
.name = "rtc-ds1390",
|
|
.owner = THIS_MODULE,
|
|
},
|
|
.probe = ds1390_probe,
|
|
.remove = __devexit_p(ds1390_remove),
|
|
};
|
|
|
|
static __init int ds1390_init(void)
|
|
{
|
|
return spi_register_driver(&ds1390_driver);
|
|
}
|
|
module_init(ds1390_init);
|
|
|
|
static __exit void ds1390_exit(void)
|
|
{
|
|
spi_unregister_driver(&ds1390_driver);
|
|
}
|
|
module_exit(ds1390_exit);
|
|
|
|
MODULE_DESCRIPTION("Dallas/Maxim DS1390/93/94 SPI RTC driver");
|
|
MODULE_AUTHOR("Mark Jackson <mpfj@mimc.co.uk>");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_ALIAS("spi:rtc-ds1390");
|