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

Commit e8f9b2ed authored by Roland Dreier's avatar Roland Dreier
Browse files

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: default avatarRoland Dreier <rolandd@cisco.com>
parent 9ef9dc69

drivers/net/mlx4/main.c

+4 −4
Original line number Diff line number Diff line
@@ -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,7 +197,7 @@ static int __devinit mlx4_load_fw(struct mlx4_dev *dev) 
	return err;

}



static int __devinit mlx4_init_cmpt_table(struct mlx4_dev *dev, u64 cmpt_base,

static int mlx4_init_cmpt_table(struct mlx4_dev *dev, u64 cmpt_base,

				int cmpt_entry_sz)

{

	struct mlx4_priv *priv = mlx4_priv(dev);
@@ -688,7 +688,7 @@ static int mlx4_setup_hca(struct mlx4_dev *dev) 
	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];

drivers/net/mlx4/mr.c

+1 −1
Original line number Diff line number Diff line
@@ -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;