diff options
Diffstat (limited to 'drivers/net/mlx4/main.c')
-rw-r--r-- | drivers/net/mlx4/main.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c index 89b3f0b7cdc0..08bfc130a33e 100644 --- a/drivers/net/mlx4/main.c +++ b/drivers/net/mlx4/main.c | |||
@@ -71,7 +71,7 @@ MODULE_PARM_DESC(msi_x, "attempt to use MSI-X if nonzero"); | |||
71 | 71 | ||
72 | #endif /* CONFIG_PCI_MSI */ | 72 | #endif /* CONFIG_PCI_MSI */ |
73 | 73 | ||
74 | static const char mlx4_version[] __devinitdata = | 74 | static char mlx4_version[] __devinitdata = |
75 | DRV_NAME ": Mellanox ConnectX core driver v" | 75 | DRV_NAME ": Mellanox ConnectX core driver v" |
76 | DRV_VERSION " (" DRV_RELDATE ")\n"; | 76 | DRV_VERSION " (" DRV_RELDATE ")\n"; |
77 | 77 | ||
@@ -163,7 +163,7 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) | |||
163 | return 0; | 163 | return 0; |
164 | } | 164 | } |
165 | 165 | ||
166 | static int __devinit mlx4_load_fw(struct mlx4_dev *dev) | 166 | static int mlx4_load_fw(struct mlx4_dev *dev) |
167 | { | 167 | { |
168 | struct mlx4_priv *priv = mlx4_priv(dev); | 168 | struct mlx4_priv *priv = mlx4_priv(dev); |
169 | int err; | 169 | int err; |
@@ -197,8 +197,8 @@ err_free: | |||
197 | return err; | 197 | return err; |
198 | } | 198 | } |
199 | 199 | ||
200 | static int __devinit mlx4_init_cmpt_table(struct mlx4_dev *dev, u64 cmpt_base, | 200 | static int mlx4_init_cmpt_table(struct mlx4_dev *dev, u64 cmpt_base, |
201 | int cmpt_entry_sz) | 201 | int cmpt_entry_sz) |
202 | { | 202 | { |
203 | struct mlx4_priv *priv = mlx4_priv(dev); | 203 | struct mlx4_priv *priv = mlx4_priv(dev); |
204 | int err; | 204 | int err; |
@@ -534,7 +534,6 @@ static int mlx4_init_hca(struct mlx4_dev *dev) | |||
534 | } | 534 | } |
535 | 535 | ||
536 | priv->eq_table.inta_pin = adapter.inta_pin; | 536 | priv->eq_table.inta_pin = adapter.inta_pin; |
537 | dev->rev_id = adapter.revision_id; | ||
538 | memcpy(dev->board_id, adapter.board_id, sizeof dev->board_id); | 537 | memcpy(dev->board_id, adapter.board_id, sizeof dev->board_id); |
539 | 538 | ||
540 | return 0; | 539 | return 0; |
@@ -688,7 +687,7 @@ err_uar_table_free: | |||
688 | return err; | 687 | return err; |
689 | } | 688 | } |
690 | 689 | ||
691 | static void __devinit mlx4_enable_msi_x(struct mlx4_dev *dev) | 690 | static void mlx4_enable_msi_x(struct mlx4_dev *dev) |
692 | { | 691 | { |
693 | struct mlx4_priv *priv = mlx4_priv(dev); | 692 | struct mlx4_priv *priv = mlx4_priv(dev); |
694 | struct msix_entry entries[MLX4_NUM_EQ]; | 693 | struct msix_entry entries[MLX4_NUM_EQ]; |