From: Greg KH <greg@kroah.com>
To: linux-kernel@vger.kernel.org, sensors@stimpy.netroedge.com
Subject: Re: [PATCH] i2c driver changes for 2.5.65
Date: Thu, 20 Mar 2003 14:32 -0800 [thread overview]
Message-ID: <10481995642207@kroah.com> (raw)
In-Reply-To: <10481995631475@kroah.com>
ChangeSet 1.1143.1.3, 2003/03/18 14:37:20-08:00, greg@kroah.com
[PATCH] i2c i2c-i801.c: fix up the pci id matching, and change to use proper pci ids.
drivers/i2c/busses/i2c-i801.c | 27 +++++++--------------------
1 files changed, 7 insertions(+), 20 deletions(-)
diff -Nru a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
--- a/drivers/i2c/busses/i2c-i801.c Thu Mar 20 12:57:37 2003
+++ b/drivers/i2c/busses/i2c-i801.c Thu Mar 20 12:57:37 2003
@@ -55,21 +55,6 @@
#define HAVE_PEC
#endif
-#ifndef PCI_DEVICE_ID_INTEL_82801CA_SMBUS
-#define PCI_DEVICE_ID_INTEL_82801CA_SMBUS 0x2483
-#endif
-
-#ifndef PCI_DEVICE_ID_INTEL_82801DB_SMBUS
-#define PCI_DEVICE_ID_INTEL_82801DB_SMBUS 0x24C3
-#endif
-
-static int supported[] = {PCI_DEVICE_ID_INTEL_82801AA_3,
- PCI_DEVICE_ID_INTEL_82801AB_3,
- PCI_DEVICE_ID_INTEL_82801BA_2,
- PCI_DEVICE_ID_INTEL_82801CA_SMBUS,
- PCI_DEVICE_ID_INTEL_82801DB_SMBUS,
- 0 };
-
/* I801 SMBus address offsets */
#define SMBHSTSTS (0 + i801_smba)
#define SMBHSTCNT (2 + i801_smba)
@@ -135,7 +120,6 @@
static int i801_setup(struct pci_dev *dev)
{
int error_return = 0;
- int *num = supported;
unsigned char temp;
/* Note: we keep on searching until we have found 'function 3' */
@@ -143,7 +127,10 @@
return -ENODEV;
I801_dev = dev;
- isich4 = *num == PCI_DEVICE_ID_INTEL_82801DB_SMBUS;
+ if (dev->device == PCI_DEVICE_ID_INTEL_82801DB_3)
+ isich4 = 1;
+ else
+ isich4 = 0;
/* Determine the address of the SMBus areas */
if (force_addr) {
@@ -290,7 +277,7 @@
hostc | SMBHSTCFG_I2C_EN);
} else {
dev_err(&I801_dev->dev,
- "I2C_SMBUS_I2C_BLOCK_READ not supported!\n");
+ "I2C_SMBUS_I2C_BLOCK_READ not DB!\n");
return -1;
}
}
@@ -607,13 +594,13 @@
},
{
.vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_INTEL_82801CA_SMBUS,
+ .device = PCI_DEVICE_ID_INTEL_82801CA_3,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
},
{
.vendor = PCI_VENDOR_ID_INTEL,
- .device = PCI_DEVICE_ID_INTEL_82801DB_SMBUS,
+ .device = PCI_DEVICE_ID_INTEL_82801DB_3,
.subvendor = PCI_ANY_ID,
.subdevice = PCI_ANY_ID,
},
next prev parent reply other threads:[~2003-03-20 22:23 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-03-20 22:30 [BK PATCH] i2c driver changes for 2.5.65 Greg KH
2005-05-19 6:23 ` Greg KH
2003-03-20 22:32 ` [PATCH] " Greg KH
2003-03-20 22:32 ` Greg KH
2005-05-19 6:23 ` Greg KH
2003-03-20 22:32 ` Greg KH [this message]
2003-03-20 22:32 ` Greg KH
2003-03-20 22:32 ` Greg KH
2005-05-19 6:23 ` Greg KH
2003-03-20 22:32 ` Greg KH
2003-03-20 22:32 ` Greg KH
2003-03-20 22:32 ` Greg KH
2003-03-20 22:32 ` Greg KH
2003-03-20 22:32 ` Greg KH
2003-03-20 22:32 ` Greg KH
2003-03-20 22:32 ` Greg KH
2003-03-20 22:32 ` Greg KH
2003-03-20 22:32 ` Greg KH
2003-03-20 22:32 ` Greg KH
2003-03-20 22:32 ` Greg KH
2003-03-20 23:41 ` Christoph Hellwig
2005-05-19 6:23 ` Christoph Hellwig
2003-03-20 23:52 ` Greg KH
2005-05-19 6:23 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=10481995642207@kroah.com \
--to=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sensors@stimpy.netroedge.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.