Skip to content

Commit

Permalink
hwmon: (i5k_amb) Load automatically on all 5000/5400 chipsets
Browse files Browse the repository at this point in the history
It turns out that we cannot create a pci_driver in this driver because PCI will
not call this module's probe function if the i5000-edac driver is already
loaded.  That said, we only want one value (AMBASE) from the PCI config space.
Neither driver alters this value, so it's safe to read it.  However, we still
want the module aliases, so provide that.

Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
  • Loading branch information
Darrick J. Wong authored and Jean Delvare committed Jan 7, 2009
1 parent b4da93e commit 6e31eb2
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions drivers/hwmon/i5k_amb.c
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,13 @@ static unsigned long chipset_ids[] = {
0
};

static struct pci_device_id i5k_amb_ids[] __devinitdata = {
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5000_ERR) },
{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_5400_ERR) },
{ 0, }
};
MODULE_DEVICE_TABLE(pci, i5k_amb_ids);

static int __devinit i5k_amb_probe(struct platform_device *pdev)
{
struct i5k_amb_data *data;
Expand Down

0 comments on commit 6e31eb2

Please sign in to comment.