Context Navigation

← Previous Changeset
Next Changeset →

Changeset 705

Timestamp:

01/24/00 21:07:29 (13 years ago)

Author:

frodo

Message:

Removing kernel 2.0 and 2.1 compatibility pass 2

Eliminated compat.h

Location:

lm-sensors/trunk/kernel

Files:

: 1 removed
: 27 modified

busses/i2c-ali15x3.c (modified) (7 diffs)
busses/i2c-amd756.c (modified) (4 diffs)
busses/i2c-hydra.c (modified) (1 diff)
busses/i2c-i801.c (modified) (5 diffs)
busses/i2c-isa.c (modified) (1 diff)
busses/i2c-piix4.c (modified) (5 diffs)
busses/i2c-sis5595.c (modified) (2 diffs)
busses/i2c-via.c (modified) (1 diff)
busses/i2c-viapro.c (modified) (5 diffs)
busses/i2c-voodoo3.c (modified) (1 diff)
chips/adm1021.c (modified) (1 diff)
chips/adm9240.c (modified) (1 diff)
chips/bt869.c (modified) (1 diff)
chips/eeprom.c (modified) (1 diff)
chips/gl518sm.c (modified) (2 diffs)
chips/gl520sm.c (modified) (1 diff)
chips/icspll.c (modified) (1 diff)
chips/lm75.c (modified) (1 diff)
chips/lm78.c (modified) (1 diff)
chips/lm80.c (modified) (1 diff)
chips/ltc1710.c (modified) (1 diff)
chips/matorb.c (modified) (1 diff)
chips/maxilife.c (modified) (1 diff)
chips/sis5595.c (modified) (2 diffs)
chips/thmc50.c (modified) (1 diff)
chips/w83781d.c (modified) (1 diff)
include/compat.h (deleted)
sensors.c (modified) (10 diffs)

Legend:

: Unmodified
: Added
: Removed

lm-sensors/trunk/kernel/busses/i2c-ali15x3.c

r704	r705
71	71	#include <linux/i2c.h>
72	72	#include "version.h"
73		~~#include "compat.h"~~
74	73
75	74	#include <linux/init.h>
…	…
216	215	are zero unless you clear the lock bits.
217	216	*/
218		pci_read_config_byte_united(ALI15X3_dev, ALI15X3_bus ,ALI15X3_devfn,
219		SMBATPC, &temp);
	217	pci_read_config_byte(ALI15X3_dev, SMBATPC, &temp);
220	218	if(temp & ALI15X3_LOCK)
221	219	{
222	220	temp &= ~ALI15X3_LOCK;
223		pci_write_config_byte_united(ALI15X3_dev, ALI15X3_bus ,ALI15X3_devfn,
224		SMBATPC, temp);
	221	pci_write_config_byte(ALI15X3_dev, SMBATPC, temp);
225	222	}
226	223
227	224	/* Determine the address of the SMBus area */
228		pci_read_config_word_united(ALI15X3_dev, ALI15X3_bus ,ALI15X3_devfn,
229		SMBBA,&ali15x3_smba);
	225	pci_read_config_word(ALI15X3_dev, SMBBA,&ali15x3_smba);
230	226	ali15x3_smba &= (0xffff & ~ (ALI15X3_SMB_IOSIZE - 1));
231	227	if(ali15x3_smba == 0) {
…	…
246	242
247	243	/* check if whole device is enabled */
248		pci_read_config_byte_united(ALI15X3_dev, ALI15X3_bus ,ALI15X3_devfn,
249		SMBCOM, &temp);
	244	pci_read_config_byte(ALI15X3_dev, SMBCOM, &temp);
250	245	if ((temp & 1) == 0) {
251	246	printk("SMBUS: Error: SMB device not enabled - upgrade BIOS?\n");
…	…
255	250
256	251	/* Is SMB Host controller enabled? */
257		pci_read_config_byte_united(ALI15X3_dev, ALI15X3_bus, ALI15X3_devfn,
258		SMBHSTCFG, &temp);
	252	pci_read_config_byte(ALI15X3_dev, SMBHSTCFG, &temp);
259	253	#ifdef FORCE_ALI15X3_ENABLE
260	254	/* This should never need to be done.
…	…
264	258	resorting to this. */
265	259	if ((temp & 1) == 0) {
266		pci_write_config_byte_united(ALI15X3_dev, ALI15X3_bus, ALI15X3_devfn,
267		SMBHSTCFG, temp \| 1);
	260	pci_write_config_byte(ALI15X3_dev, SMBHSTCFG, temp \| 1);
268	261	printk("i2c-ali15x3.o: WARNING: ALI15X3 SMBus interface has been FORCEFULLY "
269	262	"ENABLED!!\n");
…	…
278	271
279	272	/* set SMB clock to 74KHz as recommended in data sheet */
280		pci_write_config_byte_united(ALI15X3_dev, ALI15X3_bus ,ALI15X3_devfn,
281		SMBCLK, 0x20);
	273	pci_write_config_byte(ALI15X3_dev, SMBCLK, 0x20);
282	274
283	275	/* Everything is happy, let's grab the memory and set things up. */
…	…
292	284	printk("i2c-ali15x3.o: ALI15X3 using Interrupt 9 for SMBus.\n");
293	285	*/
294		pci_read_config_byte_united(ALI15X3_dev, ALI15X3_bus, ALI15X3_devfn, SMBREV,
295		&temp);
	286	pci_read_config_byte(ALI15X3_dev, SMBREV, &temp);
296	287	printk("i2c-ali15x3.o: SMBREV = 0x%X\n",temp);
297	288	printk("i2c-ali15x3.o: ALI15X3_smba = 0x%X\n",ali15x3_smba);

lm-sensors/trunk/kernel/busses/i2c-amd756.c

r704	r705
37	37	#include <linux/i2c.h>
38	38	#include "version.h"
39		~~#include "compat.h"~~
40	39
41	40	#include <linux/init.h>
…	…
161	160
162	161	/* Technically it is a dword but... */
163		pci_read_config_word_united(AMD756_dev, AMD756_bus, AMD756_devfn,
164		SMBBA, &amd756_smba);
	162	pci_read_config_word(AMD756_dev, SMBBA, &amd756_smba);
165	163	amd756_smba &= 0xfff0;
166	164
…	…
171	169	}
172	170
173		pci_read_config_byte_united(AMD756_dev, AMD756_bus, AMD756_devfn,
174		SMBGCFG, &temp);
	171	pci_read_config_byte(AMD756_dev, SMBGCFG, &temp);
175	172
176	173	if ((temp & 128) == 0) {
…	…
194	191	*/
195	192
196		pci_read_config_byte_united(AMD756_dev, AMD756_bus, AMD756_devfn, SMBREV,
197		&temp);
	193	pci_read_config_byte(AMD756_dev, SMBREV, &temp);
198	194	printk("i2c-amd756.o: SMBREV = 0x%X\n",temp);
199	195	printk("i2c-amd756.o: AMD756_smba = 0x%X\n",amd756_smba);

lm-sensors/trunk/kernel/busses/i2c-hydra.c

r704	r705
35	35	#include <linux/i2c.h>
36	36	#include <linux/i2c-algo-bit.h>
37		~~#include "compat.h"~~
38	37
39	38	#include <linux/init.h>

lm-sensors/trunk/kernel/busses/i2c-i801.c

r704	r705
36	36	#include <linux/sched.h>
37	37	#include <linux/ioport.h>
	38	#include <linux/init.h>
38	39	#include <linux/i2c.h>
39	40	#include "version.h"
40		#include "compat.h"
	41
	42	#ifndef PCI_DEVICE_ID_INTEL_82801AA_3
	43	#define PCI_DEVICE_ID_INTEL_82801AA_3 0x2413
	44	#endif
	45	#ifndef PCI_DEVICE_ID_INTEL_82801AB_3
	46	#define PCI_DEVICE_ID_INTEL_82801AB_3 0x2423
	47	#endif
41	48
42	49	/* I801 SMBus address offsets */
…	…
169	176	force = 0;
170	177	} else {
171		pci_read_config_word_united(I801_dev, I801_bus ,I801_devfn,
172		SMBBA,&i801_smba);
	178	pci_read_config_word(I801_dev, SMBBA,&i801_smba);
173	179	i801_smba &= 0xfff0;
174	180	}
…	…
180	186	}
181	187
182		pci_read_config_byte_united(I801_dev, I801_bus, I801_devfn,
183		SMBHSTCFG, &temp);
	188	pci_read_config_byte(I801_dev, SMBHSTCFG, &temp);
184	189	/* If force_addr is set, we program the new address here. Just to make
185	190	sure, we disable the I801 first. */
186	191	if (force_addr) {
187		pci_write_config_byte_united(I801_dev, I801_bus, I801_devfn,
188		SMBHSTCFG, temp & 0xfe);
189		pci_write_config_word_united(I801_dev, I801_bus ,I801_devfn,
190		SMBBA,i801_smba);
191		pci_write_config_byte_united(I801_dev, I801_bus, I801_devfn,
192		SMBHSTCFG, temp \| 0x01);
	192	pci_write_config_byte(I801_dev, SMBHSTCFG, temp & 0xfe);
	193	pci_write_config_word(I801_dev, SMBBA,i801_smba);
	194	pci_write_config_byte(I801_dev, SMBHSTCFG, temp \| 0x01);
193	195	printk("i2c-i801.o: WARNING: I801 SMBus interface set to new "
194	196	"address %04x!\n",i801_smba);
…	…
201	203	things after enabling this. :') Check for Bios updates before
202	204	resorting to this. */
203		pci_write_config_byte_united(I801_dev, I801_bus, I801_devfn,
204		SMBHSTCFG, temp \| 1);
	205	pci_write_config_byte(I801_dev, SMBHSTCFG, temp \| 1);
205	206	printk("i2c-i801.o: WARNING: I801 SMBus interface has been FORCEFULLY "
206	207	"ENABLED!\n");
…	…
223	224	printk("i2c-i801.o: I801 using PCI Interrupt for SMBus.\n");
224	225
225		pci_read_config_byte_united(I801_dev, I801_bus, I801_devfn, SMBREV,
226		&temp);
	226	pci_read_config_byte(I801_dev, SMBREV, &temp);
227	227	printk("i2c-i801.o: SMBREV = 0x%X\n",temp);
228	228	printk("i2c-i801.o: I801_smba = 0x%X\n",i801_smba);

lm-sensors/trunk/kernel/busses/i2c-isa.c

r704	r705
31	31	#include <linux/i2c.h>
32	32
33		~~#include "compat.h"~~
34	33
35	34	#include <linux/init.h>

lm-sensors/trunk/kernel/busses/i2c-piix4.c

r704	r705
32	32	#include <linux/i2c.h>
33	33	#include "version.h"
34		~~#include "compat.h"~~
35	34
36	35	#include <linux/init.h>
…	…
169	168	} else {
170	169
171		pci_read_config_word_united(PIIX4_dev, PIIX4_bus ,PIIX4_devfn,
172		SMBBA,&piix4_smba);
	170	pci_read_config_word(PIIX4_dev, SMBBA,&piix4_smba);
173	171	piix4_smba &= 0xfff0;
174	172	}
…	…
180	178	}
181	179
182		pci_read_config_byte_united(PIIX4_dev, PIIX4_bus, PIIX4_devfn,
183		SMBHSTCFG, &temp);
	180	pci_read_config_byte(PIIX4_dev, SMBHSTCFG, &temp);
184	181	/* If force_addr is set, we program the new address here. Just to make
185	182	sure, we disable the PIIX4 first. */
186	183	if (force_addr) {
187		pci_write_config_byte_united(PIIX4_dev, PIIX4_bus, PIIX4_devfn,
188		SMBHSTCFG, temp & 0xfe);
189		pci_write_config_word_united(PIIX4_dev, PIIX4_bus ,PIIX4_devfn,
190		SMBBA,piix4_smba);
191		pci_write_config_byte_united(PIIX4_dev, PIIX4_bus, PIIX4_devfn,
192		SMBHSTCFG, temp \| 0x01);
	184	pci_write_config_byte(PIIX4_dev, SMBHSTCFG, temp & 0xfe);
	185	pci_write_config_word(PIIX4_dev, SMBBA,piix4_smba);
	186	pci_write_config_byte(PIIX4_dev, SMBHSTCFG, temp \| 0x01);
193	187	printk("i2c-piix4.o: WARNING: PIIX4 SMBus interface set to new "
194	188	"address %04x!\n",piix4_smba);
…	…
201	195	things after enabling this. :') Check for Bios updates before
202	196	resorting to this. */
203		pci_write_config_byte_united(PIIX4_dev, PIIX4_bus, PIIX4_devfn,
204		SMBHSTCFG, temp \| 1);
	197	pci_write_config_byte(PIIX4_dev, SMBHSTCFG, temp \| 1);
205	198	printk("i2c-piix4.o: WARNING: PIIX4 SMBus interface has been FORCEFULLY "
206	199	"ENABLED!\n");
…	…
224	217	"of date)!\n");
225	218
226		pci_read_config_byte_united(PIIX4_dev, PIIX4_bus, PIIX4_devfn, SMBREV,
227		&temp);
	219	pci_read_config_byte(PIIX4_dev, SMBREV, &temp);
228	220	printk("i2c-piix4.o: SMBREV = 0x%X\n",temp);
229	221	printk("i2c-piix4.o: PIIX4_smba = 0x%X\n",piix4_smba);

lm-sensors/trunk/kernel/busses/i2c-sis5595.c

r704	r705
37	37	#include <linux/i2c.h>
38	38	#include "version.h"
39		~~#include "compat.h"~~
40	39
41	40	#include <linux/init.h>
…	…
161	160
162	161	/* Determine the address of the SMBus areas */
163		pci_read_config_word_united(SIS5595_dev, SIS5595_bus ,SIS5595_devfn,
164		ACPI_BASE,&sis5595_base);
	162	pci_read_config_word(SIS5595_dev, ACPI_BASE,&sis5595_base);
165	163	#ifdef DEBUG
166	164	printk("ACPI Base address: %04x\n",sis5595_base);

lm-sensors/trunk/kernel/busses/i2c-via.c

r704	r705
32	32	#include <linux/i2c.h>
33	33	#include <linux/i2c-algo-bit.h>
34		~~#include "compat.h"~~
35	34
36	35	#include <linux/init.h>

lm-sensors/trunk/kernel/busses/i2c-viapro.c

r704	r705
32	32	#include <linux/i2c.h>
33	33	#include "version.h"
34		~~#include "compat.h"~~
35	34
36	35	#include <linux/init.h>
…	…
181	180
182	181	/* Determine the configuration space registers for the SMBus areas */
183		if ((! pci_read_config_word_united(VT596_dev, VT596_bus ,VT596_devfn,
184		SMBBA1, &vt596_smba)) && (vt596_smba & 0x1)) {
	182	if ((! pci_read_config_word(VT596_dev, SMBBA1, &vt596_smba)) && (vt596_smba & 0x1)) {
185	183	smb_cf_base = SMBBA1;
186	184	smb_cf_hstcfg = 0xD2;
187		} else if ((! pci_read_config_word_united(VT596_dev, VT596_bus ,VT596_devfn,
188		SMBBA2, &vt596_smba)) && (vt596_smba & 0x1)) {
	185	} else if ((! pci_read_config_word(VT596_dev, SMBBA2, &vt596_smba)) && (vt596_smba & 0x1)) {
189	186	smb_cf_base = SMBBA2;
190	187	smb_cf_hstcfg = 0x84;
…	…
209	206	}
210	207
211		pci_read_config_byte_united(VT596_dev, VT596_bus, VT596_devfn,
212		SMBHSTCFG, &temp);
	208	pci_read_config_byte(VT596_dev, SMBHSTCFG, &temp);
213	209	/* If force_addr is set, we program the new address here. Just to make
214	210	sure, we disable the VT596 first. */
215	211	if (force_addr) {
216		pci_write_config_byte_united(VT596_dev, VT596_bus, VT596_devfn,
217		SMBHSTCFG, temp & 0xfe);
218		pci_write_config_word_united(VT596_dev, VT596_bus ,VT596_devfn,
219		SMBBA,vt596_smba);
220		pci_write_config_byte_united(VT596_dev, VT596_bus, VT596_devfn,
221		SMBHSTCFG, temp \| 0x01);
	212	pci_write_config_byte(VT596_dev, SMBHSTCFG, temp & 0xfe);
	213	pci_write_config_word(VT596_dev, SMBBA,vt596_smba);
	214	pci_write_config_byte(VT596_dev, SMBHSTCFG, temp \| 0x01);
222	215	printk("i2c-viapro.o: WARNING: VT596 SMBus interface set to new "
223	216	"address %04x!\n",vt596_smba);
…	…
228	221	things after enabling this. :') Check for Bios updates before
229	222	resorting to this. */
230		pci_write_config_byte_united(VT596_dev, VT596_bus, VT596_devfn,
231		SMBHSTCFG, temp \| 1);
	223	pci_write_config_byte(VT596_dev, SMBHSTCFG, temp \| 1);
232	224	printk("i2c-viapro.o: WARNING: SMBus interface has been FORCEFULLY "
233	225	"ENABLED!\n");
…	…
251	243	"of date)!\n");
252	244
253		pci_read_config_byte_united(VT596_dev, VT596_bus, VT596_devfn, SMBREV,
254		&temp);
	245	pci_read_config_byte(VT596_dev, SMBREV, &temp);
255	246	printk("i2c-viapro.o: SMBREV = 0x%X\n",temp);
256	247	printk("i2c-viapro.o: VT596_smba = 0x%X\n",vt596_smba);

lm-sensors/trunk/kernel/busses/i2c-voodoo3.c

r704	r705
41	41	#include <linux/i2c.h>
42	42	#include "version.h"
43		~~#include "compat.h"~~
44	43
45	44	#include <linux/init.h>

lm-sensors/trunk/kernel/chips/adm1021.c

r704	r705
27	27	#include "i2c-isa.h"
28	28	#include "version.h"
29		~~#include "compat.h"~~
30	29
31	30	#include <linux/init.h>
	31
	32	#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1))
	33	#define init_MUTEX(s) do { *(s) = MUTEX; } while(0)
	34	#endif
	35
	36	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13)
	37	#define THIS_MODULE NULL
	38	#endif
32	39
33	40	/* Addresses to scan */

lm-sensors/trunk/kernel/chips/adm9240.c

r704	r705
62	62	#include "i2c-isa.h"
63	63	#include "sensors.h"
64		~~#include "compat.h"~~
65	64	#include <linux/init.h>
66	65
	66	#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1))
	67	#define init_MUTEX(s) do { *(s) = MUTEX; } while(0)
	68	#endif
	69
	70	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13)
	71	#define THIS_MODULE NULL
	72	#endif
67	73
68	74	/* Addresses to scan */

lm-sensors/trunk/kernel/chips/bt869.c

r704	r705
29	29	#include "i2c-isa.h"
30	30	#include "version.h"
31		~~#include "compat.h"~~
32	31	#include <linux/init.h>
	32
	33	#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1))
	34	#define init_MUTEX(s) do { *(s) = MUTEX; } while(0)
	35	#endif
	36
	37	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13)
	38	#define THIS_MODULE NULL
	39	#endif
33	40
34	41

lm-sensors/trunk/kernel/chips/eeprom.c

r704	r705
27	27	#include "i2c-isa.h"
28	28	#include "version.h"
29		~~#include "compat.h"~~
30	29
31	30	#include <linux/init.h>
	31
	32	#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1))
	33	#define init_MUTEX(s) do { *(s) = MUTEX; } while(0)
	34	#endif
	35
	36	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13)
	37	#define THIS_MODULE NULL
	38	#endif
32	39
33	40	/* Addresses to scan */

lm-sensors/trunk/kernel/chips/gl518sm.c

r704	r705
28	28	#include "i2c-isa.h"
29	29	#include "version.h"
30		~~#include "compat.h"~~
31	30
32	31	#include <linux/init.h>
…	…
34	33	#ifdef __SMP__
35	34	#include <linux/smp_lock.h>
	35	#endif
	36
	37	#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1))
	38	#define init_MUTEX(s) do { *(s) = MUTEX; } while(0)
	39	#endif
	40
	41	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13)
	42	#define THIS_MODULE NULL
36	43	#endif
37	44

lm-sensors/trunk/kernel/chips/gl520sm.c

r704	r705
28	28	#include "i2c-isa.h"
29	29	#include "version.h"
30		~~#include "compat.h"~~
31
32	30	#include <linux/init.h>
	31
	32	#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1))
	33	#define init_MUTEX(s) do { *(s) = MUTEX; } while(0)
	34	#endif
	35
	36	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13)
	37	#define THIS_MODULE NULL
	38	#endif
33	39
34	40	/* Addresses to scan */

lm-sensors/trunk/kernel/chips/icspll.c

r704	r705
38	38	#include <linux/init.h>
39	39
	40
	41	#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1))
	42	#define init_MUTEX(s) do { *(s) = MUTEX; } while(0)
	43	#endif
	44
	45	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13)
	46	#define THIS_MODULE NULL
	47	#endif
40	48
41	49	/* Many constants specified below */

lm-sensors/trunk/kernel/chips/lm75.c

r704	r705
26	26	#include "i2c-isa.h"
27	27	#include "version.h"
28		~~#include "compat.h"~~
29
30	28	#include <linux/init.h>
	29
	30
	31	#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1))
	32	#define init_MUTEX(s) do { *(s) = MUTEX; } while(0)
	33	#endif
	34
	35	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13)
	36	#define THIS_MODULE NULL
	37	#endif
31	38
32	39	/* Addresses to scan */

lm-sensors/trunk/kernel/chips/lm78.c

r704	r705
32	32	#include "i2c-isa.h"
33	33	#include "sensors.h"
34		~~#include "compat.h"~~
35
36	34	#include <linux/init.h>
	35
	36	#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1))
	37	#define init_MUTEX(s) do { *(s) = MUTEX; } while(0)
	38	#endif
	39
	40	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13)
	41	#define THIS_MODULE NULL
	42	#endif
37	43
38	44	/* Addresses to scan */

lm-sensors/trunk/kernel/chips/lm80.c

r704	r705
33	33	#include "i2c-isa.h"
34	34	#include "sensors.h"
35		~~#include "compat.h"~~
36
37	35	#include <linux/init.h>
	36
	37	#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1))
	38	#define init_MUTEX(s) do { *(s) = MUTEX; } while(0)
	39	#endif
	40
	41	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13)
	42	#define THIS_MODULE NULL
	43	#endif
38	44
39	45	/* Addresses to scan */

lm-sensors/trunk/kernel/chips/ltc1710.c

r704	r705
49	49	#include "i2c-isa.h"
50	50	#include "version.h"
51		~~#include "compat.h"~~
52
53	51	#include <linux/init.h>
	52
	53
	54	#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1))
	55	#define init_MUTEX(s) do { *(s) = MUTEX; } while(0)
	56	#endif
	57
	58	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13)
	59	#define THIS_MODULE NULL
	60	#endif
54	61
55	62	/* Addresses to scan */

lm-sensors/trunk/kernel/chips/matorb.c

r704	r705
30	30	#include "i2c-isa.h"
31	31	#include "version.h"
32		~~#include "compat.h"~~
33
34	32	#include <linux/init.h>
	33
	34	#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1))
	35	#define init_MUTEX(s) do { *(s) = MUTEX; } while(0)
	36	#endif
	37
	38
	39	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13)
	40	#define THIS_MODULE NULL
	41	#endif
35	42
36	43	/* Addresses to scan */

lm-sensors/trunk/kernel/chips/maxilife.c

r704	r705
52	52	#include "sensors.h"
53	53	#include "i2c-isa.h"
54		~~#include "compat.h"~~
55
56	54	#include <linux/init.h>
	55
	56
	57	#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1))
	58	#define init_MUTEX(s) do { *(s) = MUTEX; } while(0)
	59	#endif
	60
	61	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13)
	62	#define THIS_MODULE NULL
	63	#endif
57	64
58	65

lm-sensors/trunk/kernel/chips/sis5595.c

r704	r705
35	35	#include "i2c-isa.h"
36	36	#include "sensors.h"
37		~~#include "compat.h"~~
38
39	37	#include <linux/init.h>
	38
	39
	40	#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1))
	41	#define init_MUTEX(s) do { *(s) = MUTEX; } while(0)
	42	#endif
	43
	44	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13)
	45	#define THIS_MODULE NULL
	46	#endif
40	47
41	48	/* Addresses to scan.
…	…
279	286
280	287	if ( PCIBIOS_SUCCESSFUL !=
281		pci_read_config_word_united(s_bridge, SIS_bus, SIS_devfn,
282		SIS5595_BASE_REG, &val))
	288	pci_read_config_word(s_bridge, SIS5595_BASE_REG, &val))
283	289	return -ENODEV;
284	290

lm-sensors/trunk/kernel/chips/thmc50.c

r704	r705
29	29	#include "i2c-isa.h"
30	30	#include "version.h"
31		~~#include "compat.h"~~
32
33	31	#include <linux/init.h>
	32
	33	#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1))
	34	#define init_MUTEX(s) do { *(s) = MUTEX; } while(0)
	35	#endif
	36
	37	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13)
	38	#define THIS_MODULE NULL
	39	#endif
34	40
35	41	/* Addresses to scan */

lm-sensors/trunk/kernel/chips/w83781d.c

r704	r705
46	46	#include "i2c-isa.h"
47	47	#include "sensors.h"
48		~~#include "compat.h"~~
49
50	48	#include <linux/init.h>
	49
	50	#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,3,1))
	51	#define init_MUTEX(s) do { *(s) = MUTEX; } while(0)
	52	#endif
	53
	54	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13)
	55	#define THIS_MODULE NULL
	56	#endif
51	57
52	58	/* RT Table support #defined so we can take it out if it gets bothersome */

lm-sensors/trunk/kernel/sensors.c

r704	r705
27	27	#include <linux/proc_fs.h>
28	28	#include <linux/ioport.h>
	29	#include <asm/uaccess.h>
29	30
30	31	#include "version.h"
…	…
32	33	#include "i2c-isa.h"
33	34	#include "sensors.h"
34		~~#include "compat.h"~~
35	35
36	36	#include <linux/init.h>
…	…
41	41	static int sensors_cleanup(void);
42	42	#endif /* MODULE */
	43
	44	#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,13)
	45	#define THIS_MODULE NULL
	46	#endif
43	47
44	48	static int sensors_create_name(char *name, const char prefix,
…	…
300	304	struct ctl_table *client_tbl;
301	305
302		if (oldval && oldlenp && ! get_user~~_data~~(oldlen,oldlenp) && oldlen) {
	306	if (oldval && oldlenp && ! get_user(oldlen,oldlenp) && oldlen) {
303	307	maxels = oldlen / sizeof(struct sensors_chips_data);
304	308	nrels = 0;
…	…
392	396
393	397	/* Check if we need to output the old values */
394		if (oldval && oldlenp && ! get_user~~_data~~(oldlen,oldlenp) && oldlen) {
	398	if (oldval && oldlenp && ! get_user(oldlen,oldlenp) && oldlen) {
395	399	callback(client,SENSORS_PROC_REAL_READ,table->ctl_name,&nrels,results);
396	400
…	…
445	449
446	450	/* Skip spaces at the start */
447		while (bufsize && ! get_user~~_data~~(nextchar,(char *) buffer) &&
	451	while (bufsize && ! get_user(nextchar,(char *) buffer) &&
448	452	isspace((int) nextchar)) {
449	453	bufsize --;
…	…
461	465
462	466	/* Check for a minus */
463		if (! get_user~~_data~~(nextchar,(char *) buffer) && (nextchar == '-')) {
	467	if (! get_user(nextchar,(char *) buffer) && (nextchar == '-')) {
464	468	min=1;
465	469	bufsize--;
…	…
468	472
469	473	/* Digits before a decimal dot */
470		while (bufsize && !get_user~~_data~~(nextchar,(char *) buffer) &&
	474	while (bufsize && !get_user(nextchar,(char *) buffer) &&
471	475	isdigit((int) nextchar)) {
472	476	res = res * 10 + nextchar - '0';
…	…
488	492	/* Read digits while they are significant */
489	493	while(bufsize && (mag > 0) &&
490		!get_user~~_data~~(nextchar,(char *) buffer) &&
	494	!get_user(nextchar,(char *) buffer) &&
491	495	isdigit((int) nextchar)) {
492	496	res = res * 10 + nextchar - '0';
…	…
503	507
504	508	/* Skip everything until we hit whitespace */
505		while(bufsize && !get_user~~_data~~(nextchar,(char *) buffer) &&
	509	while(bufsize && !get_user(nextchar,(char *) buffer) &&
506	510	isspace ((int) nextchar)) {
507	511	bufsize --;

Context Navigation

Changeset 705

Legend:

Download in other formats: