[lm-sensors] [PATCH 2/5] i5k_amb: Load automatically on all 5000/5400 chipsets

Jean Delvare khali at linux-fr.org
Sat Nov 8 12:09:50 CET 2008


Hi Darrick,

On Fri, 07 Nov 2008 10:56:31 -0800, Darrick J. Wong wrote:
> 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.

I seem to recall work in progress to let multiple drivers bind to the
same PCI device. Greg, Kay, what's the status?

> 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 at us.ibm.com>
> ---
> 
>  drivers/hwmon/i5k_amb.c |    8 ++++++++
>  1 files changed, 8 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/hwmon/i5k_amb.c b/drivers/hwmon/i5k_amb.c
> index 2ede938..a3fa639 100644
> --- a/drivers/hwmon/i5k_amb.c
> +++ b/drivers/hwmon/i5k_amb.c
> @@ -490,6 +490,14 @@ 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;
> 

Looks good to me, we can apply this for now.

Acked-by: Jean Delvare <khali at linux-fr.org>

-- 
Jean Delvare




More information about the lm-sensors mailing list