patch-2.4.25 linux-2.4.25/drivers/i2c/i2c-proc.c
Next file: linux-2.4.25/drivers/i2c/i2c-velleman.c
Previous file: linux-2.4.25/drivers/i2c/i2c-philips-par.c
Back to the patch index
Back to the overall index
- Lines: 143
- Date:
2004-02-18 05:36:31.000000000 -0800
- Orig file:
linux-2.4.24/drivers/i2c/i2c-proc.c
- Orig date:
2003-06-13 07:51:33.000000000 -0700
diff -urN linux-2.4.24/drivers/i2c/i2c-proc.c linux-2.4.25/drivers/i2c/i2c-proc.c
@@ -23,7 +23,6 @@
This driver puts entries in /proc/sys/dev/sensors for each I2C device
*/
-#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/slab.h>
@@ -38,10 +37,6 @@
#include <linux/init.h>
-/* FIXME need i2c versioning */
-#define LM_DATE "20010825"
-#define LM_VERSION "2.6.1"
-
#ifndef THIS_MODULE
#define THIS_MODULE NULL
#endif
@@ -67,10 +62,6 @@
static struct i2c_client *i2c_clients[SENSORS_ENTRY_MAX];
static unsigned short i2c_inodes[SENSORS_ENTRY_MAX];
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1)
-static void i2c_fill_inode(struct inode *inode, int fill);
-static void i2c_dir_fill_inode(struct inode *inode, int fill);
-#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1) */
static ctl_table sysctl_table[] = {
{CTL_DEV, "dev", NULL, 0, 0555},
@@ -200,12 +191,7 @@
#endif /* DEBUG */
i2c_inodes[id - 256] =
new_header->ctl_table->child->child->de->low_ino;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,27))
new_header->ctl_table->child->child->de->owner = controlling_mod;
-#else
- new_header->ctl_table->child->child->de->fill_inode =
- &i2c_dir_fill_inode;
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,27)) */
return id;
}
@@ -684,7 +670,7 @@
&& (addr == this_force->force[j + 1])) {
#ifdef DEBUG
printk
- ("i2c-proc.o: found force parameter for adapter %d, addr %04x\n",
+ (KERN_DEBUG "i2c-proc.o: found force parameter for adapter %d, addr %04x\n",
adapter_id, addr);
#endif
if (
@@ -714,7 +700,7 @@
&& (addr == address_data->ignore[i + 1])) {
#ifdef DEBUG
printk
- ("i2c-proc.o: found ignore parameter for adapter %d, "
+ (KERN_DEBUG "i2c-proc.o: found ignore parameter for adapter %d, "
"addr %04x\n", adapter_id, addr);
#endif
found = 1;
@@ -734,7 +720,7 @@
&& (addr <= address_data->ignore_range[i + 2])) {
#ifdef DEBUG
printk
- ("i2c-proc.o: found ignore_range parameter for adapter %d, "
+ (KERN_DEBUG "i2c-proc.o: found ignore_range parameter for adapter %d, "
"addr %04x\n", adapter_id, addr);
#endif
found = 1;
@@ -753,7 +739,7 @@
if (addr == address_data->normal_isa[i]) {
#ifdef DEBUG
printk
- ("i2c-proc.o: found normal isa entry for adapter %d, "
+ (KERN_DEBUG "i2c-proc.o: found normal isa entry for adapter %d, "
"addr %04x\n", adapter_id,
addr);
#endif
@@ -775,7 +761,7 @@
0)) {
#ifdef DEBUG
printk
- ("i2c-proc.o: found normal isa_range entry for adapter %d, "
+ (KERN_DEBUG "i2c-proc.o: found normal isa_range entry for adapter %d, "
"addr %04x", adapter_id, addr);
#endif
found = 1;
@@ -789,7 +775,7 @@
found = 1;
#ifdef DEBUG
printk
- ("i2c-proc.o: found normal i2c entry for adapter %d, "
+ (KERN_DEBUG "i2c-proc.o: found normal i2c entry for adapter %d, "
"addr %02x", adapter_id, addr);
#endif
}
@@ -805,7 +791,7 @@
{
#ifdef DEBUG
printk
- ("i2c-proc.o: found normal i2c_range entry for adapter %d, "
+ (KERN_DEBUG "i2c-proc.o: found normal i2c_range entry for adapter %d, "
"addr %04x\n", adapter_id, addr);
#endif
found = 1;
@@ -822,7 +808,7 @@
&& (addr == address_data->probe[i + 1])) {
#ifdef DEBUG
printk
- ("i2c-proc.o: found probe parameter for adapter %d, "
+ (KERN_DEBUG "i2c-proc.o: found probe parameter for adapter %d, "
"addr %04x\n", adapter_id, addr);
#endif
found = 1;
@@ -841,7 +827,7 @@
found = 1;
#ifdef DEBUG
printk
- ("i2c-proc.o: found probe_range parameter for adapter %d, "
+ (KERN_DEBUG "i2c-proc.o: found probe_range parameter for adapter %d, "
"addr %04x\n", adapter_id, addr);
#endif
}
@@ -862,17 +848,12 @@
int __init sensors_init(void)
{
- printk("i2c-proc.o version %s (%s)\n", LM_VERSION, LM_DATE);
+ printk(KERN_INFO "i2c-proc.o version %s (%s)\n", I2C_VERSION, I2C_DATE);
i2c_initialized = 0;
if (!
(i2c_proc_header =
register_sysctl_table(i2c_proc, 0))) return -ENOMEM;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,1))
i2c_proc_header->ctl_table->child->de->owner = THIS_MODULE;
-#else
- i2c_proc_header->ctl_table->child->de->fill_inode =
- &i2c_fill_inode;
-#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,1)) */
i2c_initialized++;
return 0;
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)