wt/lm-sensors
1
0 Fork 0
mirror of https://github.com/lm-sensors/lm-sensors.git synced 2026-11-10 16:30:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various cleanups to the i2c-i801 driver:

Browse Source 
* Fix self file name reference.
* i801_setup can be marked __devinit.
* Drop useless error local variable and label in i801_setup.
* Use symbolic names for SMBHSTCFG bits.
* Transmit the error code returned by i801_setup instead of forcing it
  to an arbitrary value.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@4061 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare committed 2006-06-23 21:05:37 +00:00
1 parent 21a1be7e49
commit 47bd9a6501
2 files changed
+17 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

CHANGES
+1
View File
@@ -18,6 +18,7 @@ lm_sensors CHANGES file
Add ICH8 support (2.6 backport)
Fix block transaction poll loops (2.6 backport)
Remove PCI function check (2.6 backport)
Cleanups (2.6 backport)
Module i2c-nforce2: Add nForce4 MCP51, MCP55 support (2.6 backport)
Module i2c-piix4: Add ServerWorks HT-1000 support (2.6 backport)
Add ATI IXP200, IXP300, IXP400 support (2.6 backport)
kernel/busses/i2c-i801.c
+16 -18
View File
@@ -1,5 +1,5 @@
/*
i801.c - Part of lm_sensors, Linux kernel modules for hardware
i2c-i801.c - Part of lm_sensors, Linux kernel modules for hardware
monitoring
Copyright (c) 1998 - 2002 Frodo Looijaard <frodol@dds.nl>,
Philip Edelbrock <phil@netroedge.com>, and Mark D. Studebaker
@@ -161,9 +161,8 @@ static struct pci_dev *I801_dev;
static int isich4; /* is PEC supported? */
static int isich5; /* is i2c block read supported? */
static int i801_setup(struct pci_dev *dev)
static int __devinit i801_setup(struct pci_dev *dev)
{
int error_return = 0;
unsigned char temp;
I801_dev = dev;
@@ -179,7 +178,7 @@ static int i801_setup(struct pci_dev *dev)
isich4 = 0;
isich5 = isich4 && dev->device != PCI_DEVICE_ID_INTEL_82801DB_3;
/* Determine the address of the SMBus areas */
/* Determine the address of the SMBus area */
if (force_addr) {
i801_smba = force_addr & 0xfff0;
} else {
@@ -195,8 +194,7 @@ static int i801_setup(struct pci_dev *dev)
if (!request_region(i801_smba, (isich4 ? 16 : 8), i801_driver.name)) {
dev_err(dev, "I801_smb region 0x%x already in use!\n",
i801_smba);
error_return = -EBUSY;
goto END;
return -EBUSY;
}
pci_read_config_byte(I801_dev, SMBHSTCFG, &temp);
@@ -206,17 +204,20 @@ static int i801_setup(struct pci_dev *dev)
/* If force_addr is set, we program the new address here. Just to make
sure, we disable the device first. */
if (force_addr) {
pci_write_config_byte(I801_dev, SMBHSTCFG, temp & 0xfe);
pci_write_config_byte(I801_dev, SMBHSTCFG,
temp & ~SMBHSTCFG_HST_EN);
pci_write_config_word(I801_dev, SMBBA, i801_smba);
pci_write_config_byte(I801_dev, SMBHSTCFG, temp | 0x01);
pci_write_config_byte(I801_dev, SMBHSTCFG,
temp | SMBHSTCFG_HST_EN);
dev_warn(dev, "WARNING: I801 SMBus interface set to "
"new address %04x!\n", i801_smba);
} else if ((temp & 1) == 0) {
pci_write_config_byte(I801_dev, SMBHSTCFG, temp | 1);
} else if (!(temp & SMBHSTCFG_HST_EN)) {
pci_write_config_byte(I801_dev, SMBHSTCFG,
temp | SMBHSTCFG_HST_EN);
dev_warn(dev, "enabling SMBus device\n");
}
if (temp & 0x02)
if (temp & SMBHSTCFG_SMB_SMI_EN)
dev_dbg(dev, "I801 using Interrupt SMI# for SMBus.\n");
else
dev_dbg(dev, "I801 using PCI Interrupt for SMBus.\n");
@@ -225,8 +226,7 @@ static int i801_setup(struct pci_dev *dev)
dev_dbg(dev, "SMBREV = 0x%X\n", temp);
dev_dbg(dev, "I801_smba = 0x%X\n", i801_smba);
END:
return error_return;
return 0;
}
@@ -680,12 +680,10 @@ static struct pci_device_id i801_ids[] __devinitdata = {
static int __devinit i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
{
int err;
if (i801_setup(dev)) {
dev_warn(dev,
"I801 not detected, module not inserted.\n");
return -ENODEV;
}
if ((err = i801_setup(dev)))
return err;
snprintf(i801_adapter.name, 32,
"SMBus I801 adapter at %04x", i801_smba);