mirror of
https://github.com/lm-sensors/lm-sensors.git
synced 2026-11-21 19:51:45 +00:00
(Frodo) Massive commit of all things related to mkpatch. Let's just say
it works great now. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@516 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
1 parent
dde88d36d8
commit
acd5a15556
29 files changed
+438
-148
No files matched your search
@@ -86,6 +86,7 @@
|
||||
#include <linux/init.h>
|
||||
#else
|
||||
#define __init
|
||||
#define __initdata
|
||||
#endif
|
||||
|
||||
/* undefine this if separate ACPI software is accessing the
|
||||
@@ -149,7 +150,12 @@
|
||||
#define ALI15X3_STS_ERR 0xE0 /* all the bad error bits */
|
||||
|
||||
|
||||
static int __init ali15x3_init(void);
|
||||
#ifdef MODULE
|
||||
static
|
||||
#else
|
||||
extern
|
||||
#endif
|
||||
int __init i2c_ali15x3_init(void);
|
||||
static int __init ali15x3_cleanup(void);
|
||||
static int ali15x3_setup(void);
|
||||
static s32 ali15x3_access(struct i2c_adapter *adap, u8 addr, char read_write,
|
||||
@@ -185,7 +191,7 @@ static struct i2c_adapter ali15x3_adapter = {
|
||||
NULL,
|
||||
};
|
||||
|
||||
static int __init ali15x3_initialized;
|
||||
static int __initdata ali15x3_initialized;
|
||||
#ifdef MAP_ACPI
|
||||
static unsigned short ali15x3_acpia = 0;
|
||||
#endif
|
||||
@@ -604,7 +610,7 @@ void ali15x3_dec(struct i2c_adapter *adapter)
|
||||
MOD_DEC_USE_COUNT;
|
||||
}
|
||||
|
||||
int __init ali15x3_init(void)
|
||||
int __init i2c_ali15x3_init(void)
|
||||
{
|
||||
int res;
|
||||
printk("ali15x3.o version %s (%s)\n",LM_VERSION,LM_DATE);
|
||||
@@ -666,7 +672,7 @@ MODULE_DESCRIPTION("ALI15X3 SMBus driver");
|
||||
|
||||
int init_module(void)
|
||||
{
|
||||
return ali15x3_init();
|
||||
return i2c_ali15x3_init();
|
||||
}
|
||||
|
||||
int cleanup_module(void)
|
||||
|
||||
@@ -43,6 +43,7 @@
|
||||
#include <linux/init.h>
|
||||
#else
|
||||
#define __init
|
||||
#define __initdata
|
||||
#endif
|
||||
|
||||
/* PCI device */
|
||||
@@ -176,7 +177,12 @@ static int find_hydra(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int __init init_i2c_hydra(void)
|
||||
#ifdef MODULE
|
||||
static
|
||||
#else
|
||||
extern
|
||||
#endif
|
||||
int __init i2c_init_i2c_hydra(void)
|
||||
{
|
||||
if (find_hydra() < 0) {
|
||||
printk("Error while reading PCI configuration\n");
|
||||
@@ -203,7 +209,7 @@ MODULE_DESCRIPTION("i2c for Apple Hydra Mac I/O");
|
||||
|
||||
int init_module(void)
|
||||
{
|
||||
return init_i2c_hydra();
|
||||
return i2c_init_i2c_hydra();
|
||||
}
|
||||
|
||||
void cleanup_module(void)
|
||||
|
||||
+10
-4
@@ -33,6 +33,7 @@
|
||||
#include <linux/init.h>
|
||||
#else
|
||||
#define __init
|
||||
#define __initdata
|
||||
#endif
|
||||
|
||||
#include "version.h"
|
||||
@@ -41,7 +42,12 @@
|
||||
static void isa_inc_use (struct i2c_adapter *adapter);
|
||||
static void isa_dec_use (struct i2c_adapter *adapter);
|
||||
|
||||
static int __init isa_init(void);
|
||||
#ifdef MODULE
|
||||
static
|
||||
#else
|
||||
extern
|
||||
#endif
|
||||
int __init i2c_isa_init(void);
|
||||
static int __init isa_cleanup(void);
|
||||
|
||||
#ifdef MODULE
|
||||
@@ -72,7 +78,7 @@ static struct i2c_adapter isa_adapter = {
|
||||
};
|
||||
|
||||
/* Used in isa_init/cleanup */
|
||||
static int __init isa_initialized;
|
||||
static int __initdata isa_initialized;
|
||||
|
||||
void isa_inc_use (struct i2c_adapter *adapter)
|
||||
{
|
||||
@@ -88,7 +94,7 @@ void isa_dec_use (struct i2c_adapter *adapter)
|
||||
#endif
|
||||
}
|
||||
|
||||
int __init isa_init(void)
|
||||
int __init i2c_isa_init(void)
|
||||
{
|
||||
int res;
|
||||
printk("i2c-isa.o version %s (%s)\n",LM_VERSION,LM_DATE);
|
||||
@@ -147,7 +153,7 @@ MODULE_DESCRIPTION("ISA bus access through i2c");
|
||||
|
||||
int init_module(void)
|
||||
{
|
||||
return isa_init();
|
||||
return i2c_isa_init();
|
||||
}
|
||||
|
||||
int cleanup_module(void)
|
||||
|
||||
@@ -40,6 +40,7 @@
|
||||
#include <linux/init.h>
|
||||
#else
|
||||
#define __init
|
||||
#define __initdata
|
||||
#endif
|
||||
|
||||
/* PIIX4 SMBus address offsets */
|
||||
@@ -90,7 +91,12 @@ MODULE_PARM(force_addr,"i");
|
||||
MODULE_PARM_DESC(force_addr,"Forcibly enable the PIIX4 at the given address. "
|
||||
"EXTREMELY DANGEROUS!");
|
||||
|
||||
static int __init piix4_init(void);
|
||||
#ifdef MODULE
|
||||
static
|
||||
#else
|
||||
extern
|
||||
#endif
|
||||
int __init piix4_init(void);
|
||||
static int __init piix4_cleanup(void);
|
||||
static int piix4_setup(void);
|
||||
static s32 piix4_access(struct i2c_adapter *adap, u8 addr, char read_write,
|
||||
@@ -126,7 +132,7 @@ static struct i2c_adapter piix4_adapter = {
|
||||
NULL,
|
||||
};
|
||||
|
||||
static int __init piix4_initialized;
|
||||
static int __initdata piix4_initialized;
|
||||
static unsigned short piix4_smba = 0;
|
||||
|
||||
|
||||
@@ -440,7 +446,7 @@ void piix4_dec(struct i2c_adapter *adapter)
|
||||
MOD_DEC_USE_COUNT;
|
||||
}
|
||||
|
||||
int __init piix4_init(void)
|
||||
int __init i2c_piix4_init(void)
|
||||
{
|
||||
int res;
|
||||
printk("piix4.o version %s (%s)\n",LM_VERSION,LM_DATE);
|
||||
@@ -496,7 +502,7 @@ MODULE_DESCRIPTION("PIIX4 SMBus driver");
|
||||
|
||||
int init_module(void)
|
||||
{
|
||||
return piix4_init();
|
||||
return i2c_piix4_init();
|
||||
}
|
||||
|
||||
int cleanup_module(void)
|
||||
|
||||
@@ -37,6 +37,7 @@
|
||||
#include <linux/init.h>
|
||||
#else
|
||||
#define __init
|
||||
#define __initdata
|
||||
#endif
|
||||
|
||||
#include <linux/i2c.h>
|
||||
@@ -210,7 +211,12 @@ static int find_via(void)
|
||||
}
|
||||
#endif
|
||||
|
||||
static int __init init_i2c_via(void)
|
||||
#ifdef MODULE
|
||||
static
|
||||
#else
|
||||
extern
|
||||
#endif
|
||||
int __init i2c_init_i2c_via(void)
|
||||
{
|
||||
if (find_via() < 0) {
|
||||
printk("Error while reading PCI configuration\n");
|
||||
@@ -246,7 +252,7 @@ MODULE_DESCRIPTION("i2c for Via vt82c586b southbridge");
|
||||
|
||||
int init_module(void)
|
||||
{
|
||||
return init_i2c_via();
|
||||
return i2c_init_i2c_via();
|
||||
}
|
||||
|
||||
void cleanup_module(void)
|
||||
|
||||
@@ -40,6 +40,7 @@
|
||||
#include <linux/init.h>
|
||||
#else
|
||||
#define __init
|
||||
#define __initdata
|
||||
#endif
|
||||
|
||||
|
||||
@@ -107,7 +108,12 @@ MODULE_PARM(force_addr,"i");
|
||||
MODULE_PARM_DESC(force_addr,"Forcibly enable the VT82C596 SMBus at the given address. "
|
||||
"EXTREMELY DANGEROUS!");
|
||||
|
||||
static int __init vt596_init(void);
|
||||
#ifdef MODULE
|
||||
static
|
||||
#else
|
||||
extern
|
||||
#endif
|
||||
int __init i2c_vt596_init(void);
|
||||
static int __init vt596_cleanup(void);
|
||||
static int vt596_setup(void);
|
||||
static s32 vt596_access(struct i2c_adapter *adap, u8 addr, char read_write,
|
||||
@@ -143,7 +149,7 @@ static struct i2c_adapter vt596_adapter = {
|
||||
NULL,
|
||||
};
|
||||
|
||||
static int __init vt596_initialized;
|
||||
static int __initdata vt596_initialized;
|
||||
static unsigned short vt596_smba = 0;
|
||||
|
||||
|
||||
@@ -477,7 +483,7 @@ void vt596_dec(struct i2c_adapter *adapter)
|
||||
MOD_DEC_USE_COUNT;
|
||||
}
|
||||
|
||||
int __init vt596_init(void)
|
||||
int __init i2c_vt596_init(void)
|
||||
{
|
||||
int res;
|
||||
printk("via2.o version %s (%s)\n",LM_VERSION,LM_DATE);
|
||||
@@ -534,7 +540,7 @@ MODULE_DESCRIPTION("vt82c596 SMBus driver");
|
||||
|
||||
int init_module(void)
|
||||
{
|
||||
return vt596_init();
|
||||
return i2c_vt596_init();
|
||||
}
|
||||
|
||||
int cleanup_module(void)
|
||||
|
||||
@@ -40,6 +40,7 @@
|
||||
#include <linux/init.h>
|
||||
#else
|
||||
#define __init
|
||||
#define __initdata
|
||||
#endif
|
||||
|
||||
|
||||
@@ -107,7 +108,12 @@ MODULE_PARM(force_addr,"i");
|
||||
MODULE_PARM_DESC(force_addr,"Forcibly enable the VT82C596 SMBus at the given address. "
|
||||
"EXTREMELY DANGEROUS!");
|
||||
|
||||
static int __init vt596_init(void);
|
||||
#ifdef MODULE
|
||||
static
|
||||
#else
|
||||
extern
|
||||
#endif
|
||||
int __init i2c_vt596_init(void);
|
||||
static int __init vt596_cleanup(void);
|
||||
static int vt596_setup(void);
|
||||
static s32 vt596_access(struct i2c_adapter *adap, u8 addr, char read_write,
|
||||
@@ -143,7 +149,7 @@ static struct i2c_adapter vt596_adapter = {
|
||||
NULL,
|
||||
};
|
||||
|
||||
static int __init vt596_initialized;
|
||||
static int __initdata vt596_initialized;
|
||||
static unsigned short vt596_smba = 0;
|
||||
|
||||
|
||||
@@ -477,7 +483,7 @@ void vt596_dec(struct i2c_adapter *adapter)
|
||||
MOD_DEC_USE_COUNT;
|
||||
}
|
||||
|
||||
int __init vt596_init(void)
|
||||
int __init i2c_vt596_init(void)
|
||||
{
|
||||
int res;
|
||||
printk("via2.o version %s (%s)\n",LM_VERSION,LM_DATE);
|
||||
@@ -534,7 +540,7 @@ MODULE_DESCRIPTION("vt82c596 SMBus driver");
|
||||
|
||||
int init_module(void)
|
||||
{
|
||||
return vt596_init();
|
||||
return i2c_vt596_init();
|
||||
}
|
||||
|
||||
int cleanup_module(void)
|
||||
|
||||
@@ -48,6 +48,7 @@
|
||||
#include <linux/init.h>
|
||||
#else
|
||||
#define __init
|
||||
#define __initdata
|
||||
#endif
|
||||
|
||||
/* 3DFX defines */
|
||||
@@ -58,7 +59,12 @@
|
||||
#define PCI_DEVICE_ID_3DFX_VOODOO3 0x05
|
||||
#endif
|
||||
|
||||
static int __init voodoo3_init(void);
|
||||
#ifdef MODULE
|
||||
static
|
||||
#else
|
||||
extern
|
||||
#endif
|
||||
int __init i2c_voodoo3_init(void);
|
||||
static int __init voodoo3_cleanup(void);
|
||||
static int voodoo3_setup(void);
|
||||
static s32 voodoo3_access(struct i2c_adapter *adap, u8 addr, char read_write,
|
||||
@@ -105,7 +111,7 @@ static struct i2c_adapter voodoo3_adapter = {
|
||||
NULL,
|
||||
};
|
||||
|
||||
static int __init voodoo3_initialized;
|
||||
static int __initdata voodoo3_initialized;
|
||||
static unsigned short voodoo3_smba = 0;
|
||||
static unsigned int state=0xcf980020;
|
||||
static unsigned char *mem;
|
||||
@@ -525,7 +531,7 @@ void voodoo3_dec(struct i2c_adapter *adapter)
|
||||
MOD_DEC_USE_COUNT;
|
||||
}
|
||||
|
||||
int __init voodoo3_init(void)
|
||||
int __init i2c_voodoo3_init(void)
|
||||
{
|
||||
int res;
|
||||
printk("i2c-voodoo3.o version %s (%s)\n",LM_VERSION,LM_DATE);
|
||||
@@ -583,7 +589,7 @@ MODULE_DESCRIPTION("Voodoo3 I2C/SMBus driver");
|
||||
|
||||
int init_module(void)
|
||||
{
|
||||
return voodoo3_init();
|
||||
return i2c_voodoo3_init();
|
||||
}
|
||||
|
||||
int cleanup_module(void)
|
||||
|
||||
Reference in new issue
Block a user