diff options
Diffstat (limited to 'drivers/i2c/busses/i2c-sis96x.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-sis96x.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c index ead2ff3cf60e..6a134c091324 100644 --- a/drivers/i2c/busses/i2c-sis96x.c +++ b/drivers/i2c/busses/i2c-sis96x.c | |||
| @@ -82,8 +82,9 @@ | |||
| 82 | #define SIS96x_PROC_CALL 0x04 | 82 | #define SIS96x_PROC_CALL 0x04 |
| 83 | #define SIS96x_BLOCK_DATA 0x05 | 83 | #define SIS96x_BLOCK_DATA 0x05 |
| 84 | 84 | ||
| 85 | static struct pci_driver sis96x_driver; | ||
| 85 | static struct i2c_adapter sis96x_adapter; | 86 | static struct i2c_adapter sis96x_adapter; |
| 86 | static u16 sis96x_smbus_base = 0; | 87 | static u16 sis96x_smbus_base; |
| 87 | 88 | ||
| 88 | static inline u8 sis96x_read(u8 reg) | 89 | static inline u8 sis96x_read(u8 reg) |
| 89 | { | 90 | { |
| @@ -257,7 +258,6 @@ static struct i2c_adapter sis96x_adapter = { | |||
| 257 | .owner = THIS_MODULE, | 258 | .owner = THIS_MODULE, |
| 258 | .class = I2C_CLASS_HWMON, | 259 | .class = I2C_CLASS_HWMON, |
| 259 | .algo = &smbus_algorithm, | 260 | .algo = &smbus_algorithm, |
| 260 | .name = "unset", | ||
| 261 | }; | 261 | }; |
| 262 | 262 | ||
| 263 | static struct pci_device_id sis96x_ids[] = { | 263 | static struct pci_device_id sis96x_ids[] = { |
| @@ -294,7 +294,8 @@ static int __devinit sis96x_probe(struct pci_dev *dev, | |||
| 294 | sis96x_smbus_base); | 294 | sis96x_smbus_base); |
| 295 | 295 | ||
| 296 | /* Everything is happy, let's grab the memory and set things up. */ | 296 | /* Everything is happy, let's grab the memory and set things up. */ |
| 297 | if (!request_region(sis96x_smbus_base, SMB_IOSIZE, "sis96x-smbus")) { | 297 | if (!request_region(sis96x_smbus_base, SMB_IOSIZE, |
| 298 | sis96x_driver.name)) { | ||
| 298 | dev_err(&dev->dev, "SMBus registers 0x%04x-0x%04x " | 299 | dev_err(&dev->dev, "SMBus registers 0x%04x-0x%04x " |
| 299 | "already in use!\n", sis96x_smbus_base, | 300 | "already in use!\n", sis96x_smbus_base, |
| 300 | sis96x_smbus_base + SMB_IOSIZE - 1); | 301 | sis96x_smbus_base + SMB_IOSIZE - 1); |
| @@ -328,6 +329,7 @@ static void __devexit sis96x_remove(struct pci_dev *dev) | |||
| 328 | } | 329 | } |
| 329 | 330 | ||
| 330 | static struct pci_driver sis96x_driver = { | 331 | static struct pci_driver sis96x_driver = { |
| 332 | .owner = THIS_MODULE, | ||
| 331 | .name = "sis96x_smbus", | 333 | .name = "sis96x_smbus", |
| 332 | .id_table = sis96x_ids, | 334 | .id_table = sis96x_ids, |
| 333 | .probe = sis96x_probe, | 335 | .probe = sis96x_probe, |
