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

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

IB/mthca: Fix section mismatch problems 



Quite a few cleanup functions in mthca were marked as __devexit.
However, they could also be called from error paths during
initialization, so they cannot be marked that way.  Just delete all of
the incorrect annotations.

Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent ef12d456

drivers/infiniband/hw/mthca/mthca_av.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -265,7 +265,7 @@ int __devinit mthca_init_av_table(struct mthca_dev *dev) 
	return -ENOMEM;

	return -ENOMEM;

}

}





void __devexit mthca_cleanup_av_table(struct mthca_dev *dev)

void mthca_cleanup_av_table(struct mthca_dev *dev)

{

{

	if (mthca_is_memfree(dev))

	if (mthca_is_memfree(dev))

		return;

		return;

drivers/infiniband/hw/mthca/mthca_cq.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -973,7 +973,7 @@ int __devinit mthca_init_cq_table(struct mthca_dev *dev) 
	return err;

	return err;

}

}





void __devexit mthca_cleanup_cq_table(struct mthca_dev *dev)

void mthca_cleanup_cq_table(struct mthca_dev *dev)

{

{

	mthca_array_cleanup(&dev->cq_table.cq, dev->limits.num_cqs);

	mthca_array_cleanup(&dev->cq_table.cq, dev->limits.num_cqs);

	mthca_alloc_cleanup(&dev->cq_table.alloc);

	mthca_alloc_cleanup(&dev->cq_table.alloc);

drivers/infiniband/hw/mthca/mthca_eq.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -765,7 +765,7 @@ static int __devinit mthca_map_eq_regs(struct mthca_dev *dev) 




}

}





static void __devexit mthca_unmap_eq_regs(struct mthca_dev *dev)

static void mthca_unmap_eq_regs(struct mthca_dev *dev)

{

{

	if (mthca_is_memfree(dev)) {

	if (mthca_is_memfree(dev)) {

		mthca_unmap_reg(dev, (pci_resource_len(dev->pdev, 0) - 1) &

		mthca_unmap_reg(dev, (pci_resource_len(dev->pdev, 0) - 1) &
@@ -821,7 +821,7 @@ int __devinit mthca_map_eq_icm(struct mthca_dev *dev, u64 icm_virt) 
	return ret;

	return ret;

}

}





void __devexit mthca_unmap_eq_icm(struct mthca_dev *dev)

void mthca_unmap_eq_icm(struct mthca_dev *dev)

{

{

	u8 status;

	u8 status;
@@ -954,7 +954,7 @@ err_out_free: 
	return err;

	return err;

}

}





void __devexit mthca_cleanup_eq_table(struct mthca_dev *dev)

void mthca_cleanup_eq_table(struct mthca_dev *dev)

{

{

	u8 status;

	u8 status;

	int i;

	int i;

drivers/infiniband/hw/mthca/mthca_mad.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -271,7 +271,7 @@ err: 
	return PTR_ERR(agent);

	return PTR_ERR(agent);

}

}





void mthca_free_agents(struct mthca_dev *dev)

void __devexit mthca_free_agents(struct mthca_dev *dev)

{

{

	struct ib_mad_agent *agent;

	struct ib_mad_agent *agent;

	int p, q;

	int p, q;

drivers/infiniband/hw/mthca/mthca_mcg.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -388,7 +388,7 @@ int __devinit mthca_init_mcg_table(struct mthca_dev *dev) 
	return 0;

	return 0;

}

}





void __devexit mthca_cleanup_mcg_table(struct mthca_dev *dev)

void mthca_cleanup_mcg_table(struct mthca_dev *dev)

{

{

	mthca_alloc_cleanup(&dev->mcg_table.alloc);

	mthca_alloc_cleanup(&dev->mcg_table.alloc);

}
 
}