Skip to contentSkip to conversation

mlx4: use pci_dev->revision

PATCH RESEND New Sergei Shtylyov 1 participant 1 message Jun 23, 2011

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND 2/2 mlx4: use pci_dev->revision

Commit 725c89997e03d71b09ea3c17c997da0712b9d835 (mlx4_en: Reporting HW revision in ethtool -i) added code to read the revision ID from the PCI configuration register while it's already stored by PCI subsystem in the 'revision' field of 'struct pci_dev'...

While at it, move the code being changed a bit in order to not break the initialization sequence.

---
The patch is against the recent Linus' tree.
It wasn't merged to Linux 3.0, hopefully it will be picked up for 3.1...

 drivers/net/mlx4/main.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/mlx4/main.c +2 -2
Index: linux-2.6/drivers/net/mlx4/main.c
===================================================================
@@ -1230,11 +1230,11 @@ static int __mlx4_init_one(struct pci_de
 	INIT_LIST_HEAD(&priv->pgdir_list);
 	mutex_init(&priv->pgdir_mutex);
 
-	pci_read_config_byte(pdev, PCI_REVISION_ID, &dev->rev_id);
-
 	INIT_LIST_HEAD(&priv->bf_list);
 	mutex_init(&priv->bf_mutex);
 
+	dev->rev_id = pdev->revision;
+
 	/*
 	 * Now reset the HCA before we touch the PCI capabilities or
 	 * attempt a firmware command, since a boot ROM may have left