From a745081ca1e96d4031e7bbcea6b9961d71523cc2 Mon Sep 17 00:00:00 2001 From: Russ Meyerriecks Date: Wed, 8 Dec 2010 22:11:53 +0000 Subject: dahdi: Removing loopstop maint function DAHDI_MAINT_LOOPSTOP is being removed due to the redundancy with DAHDI_MAINT_NONE. Also removing some timing logic, as amount of time a loopup or loopdown signal is held on the line, is now defined in userspace with dahdi_maint. Signed-off-by: Russ Meyerriecks Acked-by: Shaun Ruffell Acked-by: Kinsey Moore git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9515 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/wcte12xp/base.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'drivers/dahdi/wcte12xp/base.c') diff --git a/drivers/dahdi/wcte12xp/base.c b/drivers/dahdi/wcte12xp/base.c index 9870aaf..a97cd32 100644 --- a/drivers/dahdi/wcte12xp/base.c +++ b/drivers/dahdi/wcte12xp/base.c @@ -1161,7 +1161,6 @@ static void t1xxp_maint_work(struct work_struct *work) case DAHDI_MAINT_REMOTELOOP: case DAHDI_MAINT_LOOPUP: case DAHDI_MAINT_LOOPDOWN: - case DAHDI_MAINT_LOOPSTOP: t1_info(wc, "Only local loop supported in E1 mode\n"); goto cleanup; default: @@ -1202,10 +1201,6 @@ static void t1xxp_maint_work(struct work_struct *work) t1xxp_clear_maint(span); t1_setreg(wc, 0x21, 0x60); break; - case DAHDI_MAINT_LOOPSTOP: - t1xxp_clear_maint(w->span); - t1_setreg(w->wc, 0x21, 0x40); - break; default: t1_info(wc, "Unknown T1 maint command: %d\n", cmd); return; @@ -1230,7 +1225,6 @@ static int t1xxp_maint(struct dahdi_span *span, int cmd) case DAHDI_MAINT_REMOTELOOP: case DAHDI_MAINT_LOOPUP: case DAHDI_MAINT_LOOPDOWN: - case DAHDI_MAINT_LOOPSTOP: t1_info(wc, "Only local loop supported in E1 mode\n"); return -ENOSYS; default: @@ -1245,7 +1239,6 @@ static int t1xxp_maint(struct dahdi_span *span, int cmd) case DAHDI_MAINT_NETWORKPAYLOADLOOP: case DAHDI_MAINT_LOOPUP: case DAHDI_MAINT_LOOPDOWN: - case DAHDI_MAINT_LOOPSTOP: break; default: t1_info(wc, "Unknown T1 maint command: %d\n", cmd); @@ -1255,8 +1248,7 @@ static int t1xxp_maint(struct dahdi_span *span, int cmd) work = kmalloc(sizeof(*work), GFP_ATOMIC); if (!work) { - t1_info(wc, "Failed to allocate memory for " - "DAHDI_MAINT_LOOPSTOP\n"); + t1_info(wc, "Failed to allocate memory for workqueue\n"); return -ENOMEM; } -- cgit v1.2.3