diff options
author | Roland Dreier <rolandd@cisco.com> | 2008-02-04 23:20:41 -0500 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2008-02-04 23:20:41 -0500 |
commit | e8f9b2ed9882874ca96716597bd8c7113289e77b (patch) | |
tree | ab18d283baaf14da6ce4a387affd1a24f3d23336 /drivers/net/mlx4/main.c | |
parent | 9ef9dc69d4167276c04590d67ee55de8380bc1ad (diff) |
mlx4_core: Fix more section mismatches
Commit 3d73c288 ("mlx4_core: Fix section mismatches") fixed some of
the section mismatches introduced when error recovery was added, but
there were still more cases of errory recovery code calling into
__devinit code from regular .text. Fix this by getting rid of the
now-incorrect __devinit annotations.
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/net/mlx4/main.c')
-rw-r--r-- | drivers/net/mlx4/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c index 89b3f0b7cdc0..a028d8a012ff 100644 --- a/drivers/net/mlx4/main.c +++ b/drivers/net/mlx4/main.c | |||
@@ -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; |
@@ -688,7 +688,7 @@ err_uar_table_free: | |||
688 | return err; | 688 | return err; |
689 | } | 689 | } |
690 | 690 | ||
691 | static void __devinit mlx4_enable_msi_x(struct mlx4_dev *dev) | 691 | static void mlx4_enable_msi_x(struct mlx4_dev *dev) |
692 | { | 692 | { |
693 | struct mlx4_priv *priv = mlx4_priv(dev); | 693 | struct mlx4_priv *priv = mlx4_priv(dev); |
694 | struct msix_entry entries[MLX4_NUM_EQ]; | 694 | struct msix_entry entries[MLX4_NUM_EQ]; |