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: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
Родитель
ef12d45619
Коммит
e1f7868c80
|
@ -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;
|
||||||
|
|
|
@ -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);
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
|
@ -170,7 +170,7 @@ err_out:
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __devexit mthca_buddy_cleanup(struct mthca_buddy *buddy)
|
static void mthca_buddy_cleanup(struct mthca_buddy *buddy)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
@ -866,7 +866,7 @@ err_mtt_buddy:
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
void __devexit mthca_cleanup_mr_table(struct mthca_dev *dev)
|
void mthca_cleanup_mr_table(struct mthca_dev *dev)
|
||||||
{
|
{
|
||||||
/* XXX check if any MRs are still allocated? */
|
/* XXX check if any MRs are still allocated? */
|
||||||
if (dev->limits.fmr_reserved_mtts)
|
if (dev->limits.fmr_reserved_mtts)
|
||||||
|
|
|
@ -77,7 +77,7 @@ int __devinit mthca_init_pd_table(struct mthca_dev *dev)
|
||||||
dev->limits.reserved_pds);
|
dev->limits.reserved_pds);
|
||||||
}
|
}
|
||||||
|
|
||||||
void __devexit mthca_cleanup_pd_table(struct mthca_dev *dev)
|
void mthca_cleanup_pd_table(struct mthca_dev *dev)
|
||||||
{
|
{
|
||||||
/* XXX check if any PDs are still allocated? */
|
/* XXX check if any PDs are still allocated? */
|
||||||
mthca_alloc_cleanup(&dev->pd_table.alloc);
|
mthca_alloc_cleanup(&dev->pd_table.alloc);
|
||||||
|
|
|
@ -2204,7 +2204,7 @@ int __devinit mthca_init_qp_table(struct mthca_dev *dev)
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
void __devexit mthca_cleanup_qp_table(struct mthca_dev *dev)
|
void mthca_cleanup_qp_table(struct mthca_dev *dev)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
u8 status;
|
u8 status;
|
||||||
|
|
|
@ -684,7 +684,7 @@ int __devinit mthca_init_srq_table(struct mthca_dev *dev)
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
void __devexit mthca_cleanup_srq_table(struct mthca_dev *dev)
|
void mthca_cleanup_srq_table(struct mthca_dev *dev)
|
||||||
{
|
{
|
||||||
if (!(dev->mthca_flags & MTHCA_FLAG_SRQ))
|
if (!(dev->mthca_flags & MTHCA_FLAG_SRQ))
|
||||||
return;
|
return;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче