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-sis96x.c
diff --git
a/drivers/i2c/busses/i2c-sis96x.c
b/drivers/i2c/busses/i2c-sis96x.c
index
c71daa3
..
7fd07fb
100644
(file)
--- a/
drivers/i2c/busses/i2c-sis96x.c
+++ b/
drivers/i2c/busses/i2c-sis96x.c
@@
-32,7
+32,6
@@
We assume there can only be one SiS96x with one SMBus interface.
*/
We assume there can only be one SiS96x with one SMBus interface.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/kernel.h>
@@
-44,16
+43,6
@@
#include <linux/init.h>
#include <asm/io.h>
#include <linux/init.h>
#include <asm/io.h>
-/*
- HISTORY:
- 2003-05-11 1.0.0 Updated from lm_sensors project for kernel 2.5
- (was i2c-sis645.c from lm_sensors 2.7.0)
-*/
-#define SIS96x_VERSION "1.0.0"
-
-/* SiS96x SMBus PCI device ID */
-#define PCI_DEVICE_ID_SI_SMBUS 0x16
-
/* base address register in PCI config space */
#define SIS96x_BAR 0x04
/* base address register in PCI config space */
#define SIS96x_BAR 0x04
@@
-86,8
+75,9
@@
#define SIS96x_PROC_CALL 0x04
#define SIS96x_BLOCK_DATA 0x05
#define SIS96x_PROC_CALL 0x04
#define SIS96x_BLOCK_DATA 0x05
+static struct pci_driver sis96x_driver;
static struct i2c_adapter sis96x_adapter;
static struct i2c_adapter sis96x_adapter;
-static u16 sis96x_smbus_base
= 0
;
+static u16 sis96x_smbus_base;
static inline u8 sis96x_read(u8 reg)
{
static inline u8 sis96x_read(u8 reg)
{
@@
-252,9
+242,7
@@
static u32 sis96x_func(struct i2c_adapter *adapter)
I2C_FUNC_SMBUS_PROC_CALL;
}
I2C_FUNC_SMBUS_PROC_CALL;
}
-static struct i2c_algorithm smbus_algorithm = {
- .name = "Non-I2C SMBus adapter",
- .id = I2C_ALGO_SMBUS,
+static const struct i2c_algorithm smbus_algorithm = {
.smbus_xfer = sis96x_access,
.functionality = sis96x_func,
};
.smbus_xfer = sis96x_access,
.functionality = sis96x_func,
};
@@
-263,21
+251,15
@@
static struct i2c_adapter sis96x_adapter = {
.owner = THIS_MODULE,
.class = I2C_CLASS_HWMON,
.algo = &smbus_algorithm,
.owner = THIS_MODULE,
.class = I2C_CLASS_HWMON,
.algo = &smbus_algorithm,
- .name = "unset",
};
static struct pci_device_id sis96x_ids[] = {
};
static struct pci_device_id sis96x_ids[] = {
-
- {
- .vendor = PCI_VENDOR_ID_SI,
- .device = PCI_DEVICE_ID_SI_SMBUS,
- .subvendor = PCI_ANY_ID,
- .subdevice = PCI_ANY_ID,
- },
-
+ { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_SMBUS) },
{ 0, }
};
{ 0, }
};
+MODULE_DEVICE_TABLE (pci, sis96x_ids);
+
static int __devinit sis96x_probe(struct pci_dev *dev,
const struct pci_device_id *id)
{
static int __devinit sis96x_probe(struct pci_dev *dev,
const struct pci_device_id *id)
{
@@
-305,7
+287,8
@@
static int __devinit sis96x_probe(struct pci_dev *dev,
sis96x_smbus_base);
/* Everything is happy, let's grab the memory and set things up. */
sis96x_smbus_base);
/* Everything is happy, let's grab the memory and set things up. */
- if (!request_region(sis96x_smbus_base, SMB_IOSIZE, "sis96x-smbus")) {
+ if (!request_region(sis96x_smbus_base, SMB_IOSIZE,
+ sis96x_driver.name)) {
dev_err(&dev->dev, "SMBus registers 0x%04x-0x%04x "
"already in use!\n", sis96x_smbus_base,
sis96x_smbus_base + SMB_IOSIZE - 1);
dev_err(&dev->dev, "SMBus registers 0x%04x-0x%04x "
"already in use!\n", sis96x_smbus_base,
sis96x_smbus_base + SMB_IOSIZE - 1);
@@
-339,7
+322,7
@@
static void __devexit sis96x_remove(struct pci_dev *dev)
}
static struct pci_driver sis96x_driver = {
}
static struct pci_driver sis96x_driver = {
- .name = "sis96x
smbus",
+ .name = "sis96x
_
smbus",
.id_table = sis96x_ids,
.probe = sis96x_probe,
.remove = __devexit_p(sis96x_remove),
.id_table = sis96x_ids,
.probe = sis96x_probe,
.remove = __devexit_p(sis96x_remove),
@@
-347,8
+330,7
@@
static struct pci_driver sis96x_driver = {
static int __init i2c_sis96x_init(void)
{
static int __init i2c_sis96x_init(void)
{
- printk(KERN_INFO "i2c-sis96x version %s\n", SIS96x_VERSION);
- return pci_module_init(&sis96x_driver);
+ return pci_register_driver(&sis96x_driver);
}
static void __exit i2c_sis96x_exit(void)
}
static void __exit i2c_sis96x_exit(void)