mirror of
https://github.com/lm-sensors/lm-sensors.git
synced 2026-10-27 12:30:43 +00:00
Minor cleanups to the i2c-piix4 driver, backported from Linux 2.6:
* Delete unused structure. * Delete needless forward function declaration. * Spell it SMBus not SMB. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@5305 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
1 parent
5bd4f1dd99
commit
428e71b48e
2 files changed
+3
-11
No files matched your search
@@ -3,6 +3,7 @@ lm_sensors CHANGES file
|
||||
|
||||
SVN-HEAD
|
||||
Library: Avoid namespace pollution
|
||||
Module i2c-piix4: Minor cleanups (2.6 backport)
|
||||
Program sensors-detect: Add VIA VT1212 support
|
||||
Add SMSC EMC2700LPC support
|
||||
|
||||
|
||||
@@ -43,13 +43,6 @@
|
||||
#include "sensors_compat.h"
|
||||
|
||||
|
||||
struct sd {
|
||||
const unsigned short mfr;
|
||||
const unsigned short dev;
|
||||
const unsigned char fn;
|
||||
const char *name;
|
||||
};
|
||||
|
||||
/* PIIX4 SMBus address offsets */
|
||||
#define SMBHSTSTS (0 + piix4_smba)
|
||||
#define SMBHSLVSTS (1 + piix4_smba)
|
||||
@@ -102,8 +95,6 @@ MODULE_PARM_DESC(force_addr,
|
||||
"Forcibly enable the PIIX4 at the given address. "
|
||||
"EXTREMELY DANGEROUS!");
|
||||
|
||||
static int piix4_transaction(void);
|
||||
|
||||
static unsigned short piix4_smba = 0;
|
||||
static struct pci_driver piix4_driver;
|
||||
|
||||
@@ -152,7 +143,7 @@ static int __devinit piix4_setup(struct pci_dev *PIIX4_dev,
|
||||
pci_read_config_word(PIIX4_dev, SMBBA, &piix4_smba);
|
||||
piix4_smba &= 0xfff0;
|
||||
if(piix4_smba == 0) {
|
||||
printk(KERN_ERR "i2c-piix4.o: SMB base address "
|
||||
printk(KERN_ERR "i2c-piix4.o: SMBus base address "
|
||||
"uninitialized - upgrade BIOS or use "
|
||||
"force_addr=0xaddr\n");
|
||||
return -ENODEV;
|
||||
@@ -160,7 +151,7 @@ static int __devinit piix4_setup(struct pci_dev *PIIX4_dev,
|
||||
}
|
||||
|
||||
if (!request_region(piix4_smba, SMBIOSIZE, piix4_driver.name)) {
|
||||
printk(KERN_ERR "i2c-piix4.o: SMB region 0x%x already in "
|
||||
printk(KERN_ERR "i2c-piix4.o: SMBus region 0x%x already in "
|
||||
"use!\n", piix4_smba);
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user