git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
i2c
/
busses
/
i2c-amd8111.c
diff --git
a/drivers/i2c/busses/i2c-amd8111.c
b/drivers/i2c/busses/i2c-amd8111.c
index
5eb4d38
..
c0ea19e
100644
(file)
--- a/
drivers/i2c/busses/i2c-amd8111.c
+++ b/
drivers/i2c/busses/i2c-amd8111.c
@@
-67,7
+67,7
@@
struct amd_smbus {
* ACPI 2.0 chapter 13 access of registers of the EC
*/
* ACPI 2.0 chapter 13 access of registers of the EC
*/
-
static
unsigned int amd_ec_wait_write(struct amd_smbus *smbus)
+unsigned int amd_ec_wait_write(struct amd_smbus *smbus)
{
int timeout = 500;
{
int timeout = 500;
@@
-82,7
+82,7
@@
static unsigned int amd_ec_wait_write(struct amd_smbus *smbus)
return 0;
}
return 0;
}
-
static
unsigned int amd_ec_wait_read(struct amd_smbus *smbus)
+unsigned int amd_ec_wait_read(struct amd_smbus *smbus)
{
int timeout = 500;
{
int timeout = 500;
@@
-97,7
+97,7
@@
static unsigned int amd_ec_wait_read(struct amd_smbus *smbus)
return 0;
}
return 0;
}
-
static
unsigned int amd_ec_read(struct amd_smbus *smbus, unsigned char address, unsigned char *data)
+unsigned int amd_ec_read(struct amd_smbus *smbus, unsigned char address, unsigned char *data)
{
if (amd_ec_wait_write(smbus))
return -1;
{
if (amd_ec_wait_write(smbus))
return -1;
@@
-114,7
+114,7
@@
static unsigned int amd_ec_read(struct amd_smbus *smbus, unsigned char address,
return 0;
}
return 0;
}
-
static
unsigned int amd_ec_write(struct amd_smbus *smbus, unsigned char address, unsigned char data)
+unsigned int amd_ec_write(struct amd_smbus *smbus, unsigned char address, unsigned char data)
{
if (amd_ec_wait_write(smbus))
return -1;
{
if (amd_ec_wait_write(smbus))
return -1;
@@
-174,7
+174,7
@@
static unsigned int amd_ec_write(struct amd_smbus *smbus, unsigned char address,
#define AMD_SMB_PRTCL_PEC 0x80
#define AMD_SMB_PRTCL_PEC 0x80
-s
tatic s
32 amd8111_access(struct i2c_adapter * adap, u16 addr, unsigned short flags,
+s32 amd8111_access(struct i2c_adapter * adap, u16 addr, unsigned short flags,
char read_write, u8 command, int size, union i2c_smbus_data * data)
{
struct amd_smbus *smbus = adap->algo_data;
char read_write, u8 command, int size, union i2c_smbus_data * data)
{
struct amd_smbus *smbus = adap->algo_data;
@@
-315,7
+315,7
@@
static s32 amd8111_access(struct i2c_adapter * adap, u16 addr, unsigned short fl
}
}
-
static
u32 amd8111_func(struct i2c_adapter *adapter)
+u32 amd8111_func(struct i2c_adapter *adapter)
{
return I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE | I2C_FUNC_SMBUS_BYTE_DATA |
I2C_FUNC_SMBUS_WORD_DATA | I2C_FUNC_SMBUS_BLOCK_DATA |
{
return I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE | I2C_FUNC_SMBUS_BYTE_DATA |
I2C_FUNC_SMBUS_WORD_DATA | I2C_FUNC_SMBUS_BLOCK_DATA |
@@
-336,8
+336,6
@@
static struct pci_device_id amd8111_ids[] = {
{ 0, }
};
{ 0, }
};
-MODULE_DEVICE_TABLE (pci, amd8111_ids);
-
static int __devinit amd8111_probe(struct pci_dev *dev, const struct pci_device_id *id)
{
struct amd_smbus *smbus;
static int __devinit amd8111_probe(struct pci_dev *dev, const struct pci_device_id *id)
{
struct amd_smbus *smbus;
@@
-402,7
+400,7
@@
static struct pci_driver amd8111_driver = {
static int __init i2c_amd8111_init(void)
{
static int __init i2c_amd8111_init(void)
{
- return pci_
register_driver
(&amd8111_driver);
+ return pci_
module_init
(&amd8111_driver);
}
}