Browse Source

sparc/ldc: create separate ldc_unbind from ldc_free

Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Dwight Engen 10 years ago
parent
commit
1678c2bd13
2 changed files with 10 additions and 3 deletions
  1. 1 0
      arch/sparc/include/asm/ldc.h
  2. 9 3
      arch/sparc/kernel/ldc.c

+ 1 - 0
arch/sparc/include/asm/ldc.h

@@ -61,6 +61,7 @@ void ldc_free(struct ldc_channel *lp);
 
 
 /* Register TX and RX queues of the link with the hypervisor.  */
 /* Register TX and RX queues of the link with the hypervisor.  */
 int ldc_bind(struct ldc_channel *lp);
 int ldc_bind(struct ldc_channel *lp);
+void ldc_unbind(struct ldc_channel *lp);
 
 
 /* For non-RAW protocols we need to complete a handshake before
 /* For non-RAW protocols we need to complete a handshake before
  * communication can proceed.  ldc_connect() does that, if the
  * communication can proceed.  ldc_connect() does that, if the

+ 9 - 3
arch/sparc/kernel/ldc.c

@@ -1222,11 +1222,12 @@ out_err:
 }
 }
 EXPORT_SYMBOL(ldc_alloc);
 EXPORT_SYMBOL(ldc_alloc);
 
 
-void ldc_free(struct ldc_channel *lp)
+void ldc_unbind(struct ldc_channel *lp)
 {
 {
 	if (lp->flags & LDC_FLAG_REGISTERED_IRQS) {
 	if (lp->flags & LDC_FLAG_REGISTERED_IRQS) {
 		free_irq(lp->cfg.rx_irq, lp);
 		free_irq(lp->cfg.rx_irq, lp);
 		free_irq(lp->cfg.tx_irq, lp);
 		free_irq(lp->cfg.tx_irq, lp);
+		lp->flags &= ~LDC_FLAG_REGISTERED_IRQS;
 	}
 	}
 
 
 	if (lp->flags & LDC_FLAG_REGISTERED_QUEUES) {
 	if (lp->flags & LDC_FLAG_REGISTERED_QUEUES) {
@@ -1240,10 +1241,15 @@ void ldc_free(struct ldc_channel *lp)
 		lp->flags &= ~LDC_FLAG_ALLOCED_QUEUES;
 		lp->flags &= ~LDC_FLAG_ALLOCED_QUEUES;
 	}
 	}
 
 
-	hlist_del(&lp->list);
+	ldc_set_state(lp, LDC_STATE_INIT);
+}
+EXPORT_SYMBOL(ldc_unbind);
 
 
+void ldc_free(struct ldc_channel *lp)
+{
+	ldc_unbind(lp);
+	hlist_del(&lp->list);
 	kfree(lp->mssbuf);
 	kfree(lp->mssbuf);
-
 	ldc_iommu_release(lp);
 	ldc_iommu_release(lp);
 
 
 	kfree(lp);
 	kfree(lp);