Commit 9b7389c0 authored by Jean Delvare's avatar Jean Delvare Committed by Jean Delvare
Browse files

i2c-piix4: Drop redundant PCI function number check 



Checking the PCI function number doesn't add any value, and it makes
adding dynamic IDs to the driver more difficult. Drop this check.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent 0f07a24b

drivers/i2c/busses/i2c-piix4.c

+15 −26
Original line number Diff line number Diff line
@@ -121,10 +121,6 @@ static int __devinit piix4_setup(struct pci_dev *PIIX4_dev, 
{

	unsigned char temp;



	/* match up the function */

	if (PCI_FUNC(PIIX4_dev->devfn) != id->driver_data)

		return -ENODEV;



	dev_info(&PIIX4_dev->dev, "Found %s device\n", pci_name(PIIX4_dev));



	/* Don't access SMBus on IBM systems which get corrupted eeproms */
@@ -389,28 +385,21 @@ static struct i2c_adapter piix4_adapter = { 
};



static struct pci_device_id piix4_ids[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3),

	  .driver_data = 3 },

	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP200_SMBUS),

	  .driver_data = 0 },

	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP300_SMBUS),

	  .driver_data = 0 },

	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS),

	  .driver_data = 0 },

	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS),

	  .driver_data = 0 },

	{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4),

	  .driver_data = 0 },

	{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB5),

	  .driver_data = 0 },

	{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB6),

	  .driver_data = 0 },

	{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_HT1000SB),

	  .driver_data = 0 },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443MX_3),

	  .driver_data = 3 },

	{ PCI_DEVICE(PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_3),

	  .driver_data = 0 },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443MX_3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP200_SMBUS) },

	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP300_SMBUS) },

	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS) },

	{ PCI_DEVICE(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS) },

	{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS,

		     PCI_DEVICE_ID_SERVERWORKS_OSB4) },

	{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS,

		     PCI_DEVICE_ID_SERVERWORKS_CSB5) },

	{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS,

		     PCI_DEVICE_ID_SERVERWORKS_CSB6) },

	{ PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS,

		     PCI_DEVICE_ID_SERVERWORKS_HT1000SB) },

	{ 0, }

};