Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e084a8b8 authored by Zhu Yanjun's avatar Zhu Yanjun Committed by David S. Miller
Browse files

mlx4: remove unnecessary pci_set_drvdata() 



The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not necessary to manually clear the
device driver data to NULL.

Cc: Joe Jin <joe.jin@oracle.com>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Signed-off-by: default avatarZhu Yanjun <yanjun.zhu@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dc503a8a

drivers/net/ethernet/mellanox/mlx4/main.c

+0 −2
Original line number Diff line number Diff line
@@ -3782,7 +3782,6 @@ static int __mlx4_init_one(struct pci_dev *pdev, int pci_dev_data, 


err_disable_pdev:

	mlx4_pci_disable_device(&priv->dev);

	pci_set_drvdata(pdev, NULL);

	return err;

}
@@ -3997,7 +3996,6 @@ static void mlx4_remove_one(struct pci_dev *pdev) 
	devlink_unregister(devlink);

	kfree(dev->persist);

	devlink_free(devlink);

	pci_set_drvdata(pdev, NULL);

}



static int restore_current_port_types(struct mlx4_dev *dev,