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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
i2c
/
busses
/
i2c-i810.c
diff --git
a/drivers/i2c/busses/i2c-i810.c
b/drivers/i2c/busses/i2c-i810.c
index
fd11366
..
10c98bc
100644
(file)
--- a/
drivers/i2c/busses/i2c-i810.c
+++ b/
drivers/i2c/busses/i2c-i810.c
@@
-32,9
+32,9
@@
i810AB 7123
i810E 7125
i815 1132
i810AB 7123
i810E 7125
i815 1132
+ i845G 2562
*/
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
@@
-70,7
+70,7
@@
#define CYCLE_DELAY 10
#define TIMEOUT (HZ / 2)
#define CYCLE_DELAY 10
#define TIMEOUT (HZ / 2)
-static void *ioaddr;
+static void
__iomem
*ioaddr;
/* The i810 GPIO registers have individual masks for each bit
so we never have to read before writing. Nice. */
/* The i810 GPIO registers have individual masks for each bit
so we never have to read before writing. Nice. */
@@
-166,7
+166,6
@@
static struct i2c_algo_bit_data i810_i2c_bit_data = {
.getsda = bit_i810i2c_getsda,
.getscl = bit_i810i2c_getscl,
.udelay = CYCLE_DELAY,
.getsda = bit_i810i2c_getsda,
.getscl = bit_i810i2c_getscl,
.udelay = CYCLE_DELAY,
- .mdelay = CYCLE_DELAY,
.timeout = TIMEOUT,
};
.timeout = TIMEOUT,
};
@@
-182,7
+181,6
@@
static struct i2c_algo_bit_data i810_ddc_bit_data = {
.getsda = bit_i810ddc_getsda,
.getscl = bit_i810ddc_getscl,
.udelay = CYCLE_DELAY,
.getsda = bit_i810ddc_getsda,
.getscl = bit_i810ddc_getscl,
.udelay = CYCLE_DELAY,
- .mdelay = CYCLE_DELAY,
.timeout = TIMEOUT,
};
.timeout = TIMEOUT,
};
@@
-201,6
+199,8
@@
static struct pci_device_id i810_ids[] __devinitdata = {
{ 0, },
};
{ 0, },
};
+MODULE_DEVICE_TABLE (pci, i810_ids);
+
static int __devinit i810_probe(struct pci_dev *dev, const struct pci_device_id *id)
{
int retval;
static int __devinit i810_probe(struct pci_dev *dev, const struct pci_device_id *id)
{
int retval;
@@
-219,19
+219,19
@@
static int __devinit i810_probe(struct pci_dev *dev, const struct pci_device_id
return retval;
retval = i2c_bit_add_bus(&i810_ddc_adapter);
if (retval)
return retval;
retval = i2c_bit_add_bus(&i810_ddc_adapter);
if (retval)
- i2c_
bit_del_bus
(&i810_i2c_adapter);
+ i2c_
del_adapter
(&i810_i2c_adapter);
return retval;
}
static void __devexit i810_remove(struct pci_dev *dev)
{
return retval;
}
static void __devexit i810_remove(struct pci_dev *dev)
{
- i2c_
bit_del_bus
(&i810_ddc_adapter);
- i2c_
bit_del_bus
(&i810_i2c_adapter);
+ i2c_
del_adapter
(&i810_ddc_adapter);
+ i2c_
del_adapter
(&i810_i2c_adapter);
iounmap(ioaddr);
}
static struct pci_driver i810_driver = {
iounmap(ioaddr);
}
static struct pci_driver i810_driver = {
- .name = "i810
smbus",
+ .name = "i810
_
smbus",
.id_table = i810_ids,
.probe = i810_probe,
.remove = __devexit_p(i810_remove),
.id_table = i810_ids,
.probe = i810_probe,
.remove = __devexit_p(i810_remove),
@@
-239,7
+239,7
@@
static struct pci_driver i810_driver = {
static int __init i2c_i810_init(void)
{
static int __init i2c_i810_init(void)
{
- return pci_
module_init
(&i810_driver);
+ return pci_
register_driver
(&i810_driver);
}
static void __exit i2c_i810_exit(void)
}
static void __exit i2c_i810_exit(void)