IB/mthca: Fix section mismatch problems

Roland Dreier · Roland Dreier · commit e1f7868c8094 · 2006-03-29T09:36:46.000-08:00
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 &lt;rolandd@cisco.com&gt;
diff --git a/drivers/infiniband/hw/mthca/mthca_av.c b/drivers/infiniband/hw/mthca/mthca_av.c
@@ -265,7 +265,7 @@ int __devinit mthca_init_av_table(struct mthca_dev *dev)
 	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))
 		return;
diff --git a/drivers/infiniband/hw/mthca/mthca_cq.c b/drivers/infiniband/hw/mthca/mthca_cq.c
@@ -973,7 +973,7 @@ int __devinit mthca_init_cq_table(struct mthca_dev *dev)
 	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_alloc_cleanup(&dev->cq_table.alloc);
diff --git a/drivers/infiniband/hw/mthca/mthca_eq.c b/drivers/infiniband/hw/mthca/mthca_eq.c
@@ -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)) {
 		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;
 }
 
-void __devexit mthca_unmap_eq_icm(struct mthca_dev *dev)
+void mthca_unmap_eq_icm(struct mthca_dev *dev)
 {
 	u8 status;
 
@@ -954,7 +954,7 @@ int __devinit mthca_init_eq_table(struct mthca_dev *dev)
 	return err;
 }
 
-void __devexit mthca_cleanup_eq_table(struct mthca_dev *dev)
+void mthca_cleanup_eq_table(struct mthca_dev *dev)
 {
 	u8 status;
 	int i;
diff --git a/drivers/infiniband/hw/mthca/mthca_mad.c b/drivers/infiniband/hw/mthca/mthca_mad.c
@@ -271,7 +271,7 @@ int mthca_create_agents(struct mthca_dev *dev)
 	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;
 	int p, q;
diff --git a/drivers/infiniband/hw/mthca/mthca_mcg.c b/drivers/infiniband/hw/mthca/mthca_mcg.c
@@ -388,7 +388,7 @@ int __devinit mthca_init_mcg_table(struct mthca_dev *dev)
 	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);
 }
diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
@@ -170,7 +170,7 @@ static int __devinit mthca_buddy_init(struct mthca_buddy *buddy, int max_order)
 	return -ENOMEM;
 }
 
-static void __devexit mthca_buddy_cleanup(struct mthca_buddy *buddy)
+static void mthca_buddy_cleanup(struct mthca_buddy *buddy)
 {
 	int i;
 
@@ -866,7 +866,7 @@ int __devinit mthca_init_mr_table(struct mthca_dev *dev)
 	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? */
 	if (dev->limits.fmr_reserved_mtts)
diff --git a/drivers/infiniband/hw/mthca/mthca_pd.c b/drivers/infiniband/hw/mthca/mthca_pd.c
@@ -77,7 +77,7 @@ int __devinit mthca_init_pd_table(struct mthca_dev *dev)
 				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? */
 	mthca_alloc_cleanup(&dev->pd_table.alloc);
diff --git a/drivers/infiniband/hw/mthca/mthca_qp.c b/drivers/infiniband/hw/mthca/mthca_qp.c
@@ -2204,7 +2204,7 @@ int __devinit mthca_init_qp_table(struct mthca_dev *dev)
 	return err;
 }
 
-void __devexit mthca_cleanup_qp_table(struct mthca_dev *dev)
+void mthca_cleanup_qp_table(struct mthca_dev *dev)
 {
 	int i;
 	u8 status;
diff --git a/drivers/infiniband/hw/mthca/mthca_srq.c b/drivers/infiniband/hw/mthca/mthca_srq.c
@@ -684,7 +684,7 @@ int __devinit mthca_init_srq_table(struct mthca_dev *dev)
 	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))
 		return;

Original file line number	Diff line number	Diff line change
`@@ -265,7 +265,7 @@ int __devinit mthca_init_av_table(struct mthca_dev *dev)`
`265`	`265`	`return -ENOMEM;`
`266`	`266`	`}`
`267`	`267`
`268`		`-void __devexit mthca_cleanup_av_table(struct mthca_dev *dev)`
	`268`	`+void mthca_cleanup_av_table(struct mthca_dev *dev)`
`269`	`269`	`{`
`270`	`270`	`if (mthca_is_memfree(dev))`
`271`	`271`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -973,7 +973,7 @@ int __devinit mthca_init_cq_table(struct mthca_dev *dev)`
`973`	`973`	`return err;`
`974`	`974`	`}`
`975`	`975`
`976`		`-void __devexit mthca_cleanup_cq_table(struct mthca_dev *dev)`
	`976`	`+void mthca_cleanup_cq_table(struct mthca_dev *dev)`
`977`	`977`	`{`
`978`	`978`	`mthca_array_cleanup(&dev->cq_table.cq, dev->limits.num_cqs);`
`979`	`979`	`mthca_alloc_cleanup(&dev->cq_table.alloc);`
Original file line number	Diff line number	Diff line change
`@@ -765,7 +765,7 @@ static int __devinit mthca_map_eq_regs(struct mthca_dev *dev)`
`765`	`765`
`766`	`766`	`}`
`767`	`767`
`768`		`-static void __devexit mthca_unmap_eq_regs(struct mthca_dev *dev)`
	`768`	`+static void mthca_unmap_eq_regs(struct mthca_dev *dev)`
`769`	`769`	`{`
`770`	`770`	`if (mthca_is_memfree(dev)) {`
`771`	`771`	`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)`
`821`	`821`	`return ret;`
`822`	`822`	`}`
`823`	`823`
`824`		`-void __devexit mthca_unmap_eq_icm(struct mthca_dev *dev)`
	`824`	`+void mthca_unmap_eq_icm(struct mthca_dev *dev)`
`825`	`825`	`{`
`826`	`826`	`u8 status;`
`827`	`827`
`@@ -954,7 +954,7 @@ int __devinit mthca_init_eq_table(struct mthca_dev *dev)`
`954`	`954`	`return err;`
`955`	`955`	`}`
`956`	`956`
`957`		`-void __devexit mthca_cleanup_eq_table(struct mthca_dev *dev)`
	`957`	`+void mthca_cleanup_eq_table(struct mthca_dev *dev)`
`958`	`958`	`{`
`959`	`959`	`u8 status;`
`960`	`960`	`int i;`
Original file line number	Diff line number	Diff line change
`@@ -271,7 +271,7 @@ int mthca_create_agents(struct mthca_dev *dev)`
`271`	`271`	`return PTR_ERR(agent);`
`272`	`272`	`}`
`273`	`273`
`274`		`-void mthca_free_agents(struct mthca_dev *dev)`
	`274`	`+void __devexit mthca_free_agents(struct mthca_dev *dev)`
`275`	`275`	`{`
`276`	`276`	`struct ib_mad_agent *agent;`
`277`	`277`	`int p, q;`
Original file line number	Diff line number	Diff line change
`@@ -388,7 +388,7 @@ int __devinit mthca_init_mcg_table(struct mthca_dev *dev)`
`388`	`388`	`return 0;`
`389`	`389`	`}`
`390`	`390`
`391`		`-void __devexit mthca_cleanup_mcg_table(struct mthca_dev *dev)`
	`391`	`+void mthca_cleanup_mcg_table(struct mthca_dev *dev)`
`392`	`392`	`{`
`393`	`393`	`mthca_alloc_cleanup(&dev->mcg_table.alloc);`
`394`	`394`	`}`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ static int __devinit mthca_buddy_init(struct mthca_buddy *buddy, int max_order)`
`170`	`170`	`return -ENOMEM;`
`171`	`171`	`}`
`172`	`172`
`173`		`-static void __devexit mthca_buddy_cleanup(struct mthca_buddy *buddy)`
	`173`	`+static void mthca_buddy_cleanup(struct mthca_buddy *buddy)`
`174`	`174`	`{`
`175`	`175`	`int i;`
`176`	`176`
`@@ -866,7 +866,7 @@ int __devinit mthca_init_mr_table(struct mthca_dev *dev)`
`866`	`866`	`return err;`
`867`	`867`	`}`
`868`	`868`
`869`		`-void __devexit mthca_cleanup_mr_table(struct mthca_dev *dev)`
	`869`	`+void mthca_cleanup_mr_table(struct mthca_dev *dev)`
`870`	`870`	`{`
`871`	`871`	`/* XXX check if any MRs are still allocated? */`
`872`	`872`	`if (dev->limits.fmr_reserved_mtts)`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ int __devinit mthca_init_pd_table(struct mthca_dev *dev)`
`77`	`77`	`dev->limits.reserved_pds);`
`78`	`78`	`}`
`79`	`79`
`80`		`-void __devexit mthca_cleanup_pd_table(struct mthca_dev *dev)`
	`80`	`+void mthca_cleanup_pd_table(struct mthca_dev *dev)`
`81`	`81`	`{`
`82`	`82`	`/* XXX check if any PDs are still allocated? */`
`83`	`83`	`mthca_alloc_cleanup(&dev->pd_table.alloc);`
Original file line number	Diff line number	Diff line change
`@@ -2204,7 +2204,7 @@ int __devinit mthca_init_qp_table(struct mthca_dev *dev)`
`2204`	`2204`	`return err;`
`2205`	`2205`	`}`
`2206`	`2206`
`2207`		`-void __devexit mthca_cleanup_qp_table(struct mthca_dev *dev)`
	`2207`	`+void mthca_cleanup_qp_table(struct mthca_dev *dev)`
`2208`	`2208`	`{`
`2209`	`2209`	`int i;`
`2210`	`2210`	`u8 status;`
Original file line number	Diff line number	Diff line change
`@@ -684,7 +684,7 @@ int __devinit mthca_init_srq_table(struct mthca_dev *dev)`
`684`	`684`	`return err;`
`685`	`685`	`}`
`686`	`686`
`687`		`-void __devexit mthca_cleanup_srq_table(struct mthca_dev *dev)`
	`687`	`+void mthca_cleanup_srq_table(struct mthca_dev *dev)`
`688`	`688`	`{`
`689`	`689`	`if (!(dev->mthca_flags & MTHCA_FLAG_SRQ))`
`690`	`690`	`return;`