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-hydra.c
diff --git
a/drivers/i2c/busses/i2c-hydra.c
b/drivers/i2c/busses/i2c-hydra.c
index
7d6d691
..
9832f77
100644
(file)
--- a/
drivers/i2c/busses/i2c-hydra.c
+++ b/
drivers/i2c/busses/i2c-hydra.c
@@
-99,7
+99,6
@@
static struct i2c_algo_bit_data hydra_bit_data = {
.getsda = hydra_bit_getsda,
.getscl = hydra_bit_getscl,
.udelay = 5,
.getsda = hydra_bit_getsda,
.getscl = hydra_bit_getscl,
.udelay = 5,
- .mdelay = 5,
.timeout = HZ
};
.timeout = HZ
};
@@
-111,15
+110,12
@@
static struct i2c_adapter hydra_adap = {
};
static struct pci_device_id hydra_ids[] = {
};
static struct pci_device_id hydra_ids[] = {
- {
- .vendor = PCI_VENDOR_ID_APPLE,
- .device = PCI_DEVICE_ID_APPLE_HYDRA,
- .subvendor = PCI_ANY_ID,
- .subdevice = PCI_ANY_ID,
- },
+ { PCI_DEVICE(PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_HYDRA) },
{ 0, }
};
{ 0, }
};
+MODULE_DEVICE_TABLE (pci, hydra_ids);
+
static int __devinit hydra_probe(struct pci_dev *dev,
const struct pci_device_id *id)
{
static int __devinit hydra_probe(struct pci_dev *dev,
const struct pci_device_id *id)
{
@@
-150,7
+146,7
@@
static int __devinit hydra_probe(struct pci_dev *dev,
static void __devexit hydra_remove(struct pci_dev *dev)
{
pdregw(hydra_bit_data.data, 0); /* clear SCLK_OE and SDAT_OE */
static void __devexit hydra_remove(struct pci_dev *dev)
{
pdregw(hydra_bit_data.data, 0); /* clear SCLK_OE and SDAT_OE */
- i2c_
bit_del_bus
(&hydra_adap);
+ i2c_
del_adapter
(&hydra_adap);
iounmap(hydra_bit_data.data);
release_mem_region(pci_resource_start(dev, 0)+
offsetof(struct Hydra, CachePD), 4);
iounmap(hydra_bit_data.data);
release_mem_region(pci_resource_start(dev, 0)+
offsetof(struct Hydra, CachePD), 4);
@@
-158,7
+154,7
@@
static void __devexit hydra_remove(struct pci_dev *dev)
static struct pci_driver hydra_driver = {
static struct pci_driver hydra_driver = {
- .name = "hydra
smbus",
+ .name = "hydra
_
smbus",
.id_table = hydra_ids,
.probe = hydra_probe,
.remove = __devexit_p(hydra_remove),
.id_table = hydra_ids,
.probe = hydra_probe,
.remove = __devexit_p(hydra_remove),
@@
-166,7
+162,7
@@
static struct pci_driver hydra_driver = {
static int __init i2c_hydra_init(void)
{
static int __init i2c_hydra_init(void)
{
- return pci_
module_init
(&hydra_driver);
+ return pci_
register_driver
(&hydra_driver);
}
}