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
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
i2c
/
busses
/
i2c-ali1535.c
diff --git
a/drivers/i2c/busses/i2c-ali1535.c
b/drivers/i2c/busses/i2c-ali1535.c
index
c0a85e2
..
b00cd40
100644
(file)
--- a/
drivers/i2c/busses/i2c-ali1535.c
+++ b/
drivers/i2c/busses/i2c-ali1535.c
@@
-137,7
+137,7
@@
static unsigned short ali1535_smba;
static unsigned short ali1535_smba;
-DECLARE_MUTEX(i2c_ali1535_sem);
+
static
DECLARE_MUTEX(i2c_ali1535_sem);
/* Detect whether a ALI1535 can be found, and initialize it, where necessary.
Note the differences between kernels with the old PCI BIOS interface and
/* Detect whether a ALI1535 can be found, and initialize it, where necessary.
Note the differences between kernels with the old PCI BIOS interface and
@@
-465,7
+465,7
@@
EXIT:
}
}
-u32 ali1535_func(struct i2c_adapter *adapter)
+
static
u32 ali1535_func(struct i2c_adapter *adapter)
{
return I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |
I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA |
{
return I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |
I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA |
@@
-487,15
+487,12
@@
static struct i2c_adapter ali1535_adapter = {
};
static struct pci_device_id ali1535_ids[] = {
};
static struct pci_device_id ali1535_ids[] = {
- {
- .vendor = PCI_VENDOR_ID_AL,
- .device = PCI_DEVICE_ID_AL_M7101,
- .subvendor = PCI_ANY_ID,
- .subdevice = PCI_ANY_ID,
- },
+ { PCI_DEVICE(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101) },
{ },
};
{ },
};
+MODULE_DEVICE_TABLE (pci, ali1535_ids);
+
static int __devinit ali1535_probe(struct pci_dev *dev, const struct pci_device_id *id)
{
if (ali1535_setup(dev)) {
static int __devinit ali1535_probe(struct pci_dev *dev, const struct pci_device_id *id)
{
if (ali1535_setup(dev)) {
@@
-527,7
+524,7
@@
static struct pci_driver ali1535_driver = {
static int __init i2c_ali1535_init(void)
{
static int __init i2c_ali1535_init(void)
{
- return pci_
module_init
(&ali1535_driver);
+ return pci_
register_driver
(&ali1535_driver);
}
static void __exit i2c_ali1535_exit(void)
}
static void __exit i2c_ali1535_exit(void)