diff options
| author | Roland Dreier <rolandd@cisco.com> | 2008-02-04 20:20:41 -0800 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2008-02-04 20:20:41 -0800 |
| commit | e8f9b2ed9882874ca96716597bd8c7113289e77b (patch) | |
| tree | ab18d283baaf14da6ce4a387affd1a24f3d23336 /drivers/net | |
| parent | 9ef9dc69d4167276c04590d67ee55de8380bc1ad (diff) | |
| download | linux-e8f9b2ed9882874ca96716597bd8c7113289e77b.tar.gz linux-e8f9b2ed9882874ca96716597bd8c7113289e77b.tar.bz2 linux-e8f9b2ed9882874ca96716597bd8c7113289e77b.zip | |
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')
| -rw-r--r-- | drivers/net/mlx4/main.c | 8 | ||||
| -rw-r--r-- | drivers/net/mlx4/mr.c | 2 |
2 files changed, 5 insertions, 5 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) return 0; } -static int __devinit mlx4_load_fw(struct mlx4_dev *dev) +static int mlx4_load_fw(struct mlx4_dev *dev) { struct mlx4_priv *priv = mlx4_priv(dev); int err; @@ -197,8 +197,8 @@ err_free: return err; } -static int __devinit mlx4_init_cmpt_table(struct mlx4_dev *dev, u64 cmpt_base, - int cmpt_entry_sz) +static int mlx4_init_cmpt_table(struct mlx4_dev *dev, u64 cmpt_base, + int cmpt_entry_sz) { struct mlx4_priv *priv = mlx4_priv(dev); int err; @@ -688,7 +688,7 @@ err_uar_table_free: return err; } -static void __devinit mlx4_enable_msi_x(struct mlx4_dev *dev) +static void mlx4_enable_msi_x(struct mlx4_dev *dev) { struct mlx4_priv *priv = mlx4_priv(dev); struct msix_entry entries[MLX4_NUM_EQ]; diff --git a/drivers/net/mlx4/mr.c b/drivers/net/mlx4/mr.c index 0c05a10bae3b..9c9e308d0917 100644 --- a/drivers/net/mlx4/mr.c +++ b/drivers/net/mlx4/mr.c @@ -122,7 +122,7 @@ static void mlx4_buddy_free(struct mlx4_buddy *buddy, u32 seg, int order) spin_unlock(&buddy->lock); } -static int __devinit mlx4_buddy_init(struct mlx4_buddy *buddy, int max_order) +static int mlx4_buddy_init(struct mlx4_buddy *buddy, int max_order) { int i, s; |