Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[sfrench/cifs-2.6.git] / drivers / net / ethernet / mellanox / mlx4 / main.c

diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index 5fe5cdc5135776abb8fd4df748b0948520504b48..9ea2b0db62290b015dd457c76f14295c67923270 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -925,10 +925,10 @@ static int mlx4_slave_cap(struct mlx4_dev *dev)
        mlx4_replace_zero_macs(dev);
 
        dev->caps.qp0_qkey = kcalloc(dev->caps.num_ports, sizeof(u32), GFP_KERNEL);
-       dev->caps.qp0_tunnel = kcalloc(dev->caps.num_ports, sizeof (u32), GFP_KERNEL);
-       dev->caps.qp0_proxy = kcalloc(dev->caps.num_ports, sizeof (u32), GFP_KERNEL);
-       dev->caps.qp1_tunnel = kcalloc(dev->caps.num_ports, sizeof (u32), GFP_KERNEL);
-       dev->caps.qp1_proxy = kcalloc(dev->caps.num_ports, sizeof (u32), GFP_KERNEL);
+       dev->caps.qp0_tunnel = kcalloc(dev->caps.num_ports, sizeof(u32), GFP_KERNEL);
+       dev->caps.qp0_proxy = kcalloc(dev->caps.num_ports, sizeof(u32), GFP_KERNEL);
+       dev->caps.qp1_tunnel = kcalloc(dev->caps.num_ports, sizeof(u32), GFP_KERNEL);
+       dev->caps.qp1_proxy = kcalloc(dev->caps.num_ports, sizeof(u32), GFP_KERNEL);
 
        if (!dev->caps.qp0_tunnel || !dev->caps.qp0_proxy ||
            !dev->caps.qp1_tunnel || !dev->caps.qp1_proxy ||
@@ -2399,7 +2399,7 @@ static int mlx4_init_hca(struct mlx4_dev *dev)
                dev->caps.rx_checksum_flags_port[2] = params.rx_csum_flags_port_2;
        }
        priv->eq_table.inta_pin = adapter.inta_pin;
-       memcpy(dev->board_id, adapter.board_id, sizeof dev->board_id);
+       memcpy(dev->board_id, adapter.board_id, sizeof(dev->board_id));
 
        return 0;
 
@@ -2869,7 +2869,7 @@ static void mlx4_enable_msi_x(struct mlx4_dev *dev)
                                dev->caps.num_eqs - dev->caps.reserved_eqs,
                                MAX_MSIX);
 
-               entries = kcalloc(nreq, sizeof *entries, GFP_KERNEL);
+               entries = kcalloc(nreq, sizeof(*entries), GFP_KERNEL);
                if (!entries)
                        goto no_msi;
 
@@ -3782,7 +3782,6 @@ err_release_regions:
 
 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,