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-via.c
diff --git
a/drivers/i2c/busses/i2c-via.c
b/drivers/i2c/busses/i2c-via.c
index
2cbc4cd
..
15d7e00
100644
(file)
--- a/
drivers/i2c/busses/i2c-via.c
+++ b/
drivers/i2c/busses/i2c-via.c
@@
-21,7
+21,6
@@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
@@
-44,9
+43,9
@@
/* io-region reservation */
#define IOSPACE 0x06
/* io-region reservation */
#define IOSPACE 0x06
-#define IOTEXT "via-i2c"
-static u16 pm_io_base = 0;
+static struct pci_driver vt586b_driver;
+static u16 pm_io_base;
/*
It does not appear from the datasheet that the GPIO pins are
/*
It does not appear from the datasheet that the GPIO pins are
@@
-82,7
+81,6
@@
static struct i2c_algo_bit_data bit_data = {
.getsda = bit_via_getsda,
.getscl = bit_via_getscl,
.udelay = 5,
.getsda = bit_via_getsda,
.getscl = bit_via_getscl,
.udelay = 5,
- .mdelay = 5,
.timeout = HZ
};
.timeout = HZ
};
@@
-131,7
+129,7
@@
static int __devinit vt586b_probe(struct pci_dev *dev, const struct pci_device_i
pci_read_config_word(dev, base, &pm_io_base);
pm_io_base &= (0xff << 8);
pci_read_config_word(dev, base, &pm_io_base);
pm_io_base &= (0xff << 8);
- if (!request_region(I2C_DIR, IOSPACE,
IOTEXT
)) {
+ if (!request_region(I2C_DIR, IOSPACE,
vt586b_driver.name
)) {
dev_err(&dev->dev, "IO 0x%x-0x%x already in use\n", I2C_DIR, I2C_DIR + IOSPACE);
return -ENODEV;
}
dev_err(&dev->dev, "IO 0x%x-0x%x already in use\n", I2C_DIR, I2C_DIR + IOSPACE);
return -ENODEV;
}
@@
-153,7
+151,7
@@
static int __devinit vt586b_probe(struct pci_dev *dev, const struct pci_device_i
static void __devexit vt586b_remove(struct pci_dev *dev)
{
static void __devexit vt586b_remove(struct pci_dev *dev)
{
- i2c_
bit_del_bus
(&vt586b_adapter);
+ i2c_
del_adapter
(&vt586b_adapter);
release_region(I2C_DIR, IOSPACE);
pm_io_base = 0;
}
release_region(I2C_DIR, IOSPACE);
pm_io_base = 0;
}