[PATCH net-next] net/mlx4_core: pass pci_device_id.driver_data to __mlx4_init_one during reset

[PATCH net-next] net/mlx4_core: pass pci_device_id.driver_data to __mlx4_init_one during reset

[Wei Yang]

The second parameter of __mlx4_init_one() is used to identify whether the
pci_dev is a PF or VF. Currently, when it is invoked in mlx4_pci_slot_reset()
this information is missed.

This patch match the pci_dev with mlx4_pci_table and passes the
pci_device_id.driver_data to __mlx4_init_one() in mlx4_pci_slot_reset().

Tested with Mellanox ConnectX-3.

Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
---
 drivers/net/ethernet/mellanox/mlx4/main.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index d711158..b083808 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -2670,7 +2670,11 @@ static pci_ers_result_t mlx4_pci_err_detected(struct pci_dev *pdev,
 
 static pci_ers_result_t mlx4_pci_slot_reset(struct pci_dev *pdev)
 {
-	int ret = __mlx4_init_one(pdev, 0);
+	const struct pci_device_id*  id;
+	int ret;
+
+	id = pci_match_id(mlx4_pci_table, pdev);
+	ret = __mlx4_init_one(pdev, id->driver_data);
 
 	return ret ? PCI_ERS_RESULT_DISCONNECT : PCI_ERS_RESULT_RECOVERED;
 }
-- 
1.7.9.5

Re: [PATCH net-next] net/mlx4_core: pass pci_device_id.driver_data to __mlx4_init_one during reset

[David Miller]

From: Wei Yang <weiyang@linux.vnet.ibm.com>
Date: Tue, 25 Mar 2014 22:10:19 +0800

> +	const struct pci_device_id*  id;

This is not the correct way to format a pointer declaration, it's

	TYPE *VAR;

not

	TYPE* VAR;