diff options
Diffstat (limited to 'drivers/i2c/busses/i2c-amd756.c')
-rw-r--r-- | drivers/i2c/busses/i2c-amd756.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/i2c/busses/i2c-amd756.c b/drivers/i2c/busses/i2c-amd756.c index 6ad0603384b8..de035d137c3f 100644 --- a/drivers/i2c/busses/i2c-amd756.c +++ b/drivers/i2c/busses/i2c-amd756.c | |||
@@ -85,8 +85,8 @@ | |||
85 | #define AMD756_PROCESS_CALL 0x04 | 85 | #define AMD756_PROCESS_CALL 0x04 |
86 | #define AMD756_BLOCK_DATA 0x05 | 86 | #define AMD756_BLOCK_DATA 0x05 |
87 | 87 | ||
88 | 88 | static struct pci_driver amd756_driver; | |
89 | static unsigned short amd756_ioport = 0; | 89 | static unsigned short amd756_ioport; |
90 | 90 | ||
91 | /* | 91 | /* |
92 | SMBUS event = I/O 28-29 bit 11 | 92 | SMBUS event = I/O 28-29 bit 11 |
@@ -303,7 +303,6 @@ struct i2c_adapter amd756_smbus = { | |||
303 | .owner = THIS_MODULE, | 303 | .owner = THIS_MODULE, |
304 | .class = I2C_CLASS_HWMON, | 304 | .class = I2C_CLASS_HWMON, |
305 | .algo = &smbus_algorithm, | 305 | .algo = &smbus_algorithm, |
306 | .name = "unset", | ||
307 | }; | 306 | }; |
308 | 307 | ||
309 | enum chiptype { AMD756, AMD766, AMD768, NFORCE, AMD8111 }; | 308 | enum chiptype { AMD756, AMD766, AMD768, NFORCE, AMD8111 }; |
@@ -365,7 +364,7 @@ static int __devinit amd756_probe(struct pci_dev *pdev, | |||
365 | amd756_ioport += SMB_ADDR_OFFSET; | 364 | amd756_ioport += SMB_ADDR_OFFSET; |
366 | } | 365 | } |
367 | 366 | ||
368 | if (!request_region(amd756_ioport, SMB_IOSIZE, "amd756-smbus")) { | 367 | if (!request_region(amd756_ioport, SMB_IOSIZE, amd756_driver.name)) { |
369 | dev_err(&pdev->dev, "SMB region 0x%x already in use!\n", | 368 | dev_err(&pdev->dev, "SMB region 0x%x already in use!\n", |
370 | amd756_ioport); | 369 | amd756_ioport); |
371 | return -ENODEV; | 370 | return -ENODEV; |
@@ -402,6 +401,7 @@ static void __devexit amd756_remove(struct pci_dev *dev) | |||
402 | } | 401 | } |
403 | 402 | ||
404 | static struct pci_driver amd756_driver = { | 403 | static struct pci_driver amd756_driver = { |
404 | .owner = THIS_MODULE, | ||
405 | .name = "amd756_smbus", | 405 | .name = "amd756_smbus", |
406 | .id_table = amd756_ids, | 406 | .id_table = amd756_ids, |
407 | .probe = amd756_probe, | 407 | .probe = amd756_probe, |