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>

diff --git a/arch/sparc/include/asm/ldc.h b/arch/sparc/include/asm/ldc.h
index 58ab64de25d2ce7133c8af67882d37a478f51d78..6e9004aa6f25d5af47c3a2e95a74a1bdb6008c6f 100644 (file)
--- a/arch/sparc/include/asm/ldc.h
+++ b/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.  */
 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
  * communication can proceed.  ldc_connect() does that, if the

diff --git a/arch/sparc/kernel/ldc.c b/arch/sparc/kernel/ldc.c
index 4310332872d4cf90727b1e91b900dcbe601d296f..274a9f59d95cee9b2f6fcb0318a9ac78d8b17e6b 100644 (file)
--- a/arch/sparc/kernel/ldc.c
+++ b/arch/sparc/kernel/ldc.c
@@ -1222,11 +1222,12 @@ out_err:
 }
 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) {
                free_irq(lp->cfg.rx_irq, lp);
                free_irq(lp->cfg.tx_irq, lp);
+               lp->flags &= ~LDC_FLAG_REGISTERED_IRQS;
        }
 
        if (lp->flags & LDC_FLAG_REGISTERED_QUEUES) {
@@ -1240,10 +1241,15 @@ void ldc_free(struct ldc_channel *lp)
                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);
-
        ldc_iommu_release(lp);
 
        kfree(lp);