From 94a59c9ad966f862efe678c67117a50f06d5baeb Mon Sep 17 00:00:00 2001
From: mspiceland <mspiceland@5390a7c7-147a-4af0-8ec9-7488f05a26cb>
Date: Tue, 11 Dec 2007 00:53:29 +0000
Subject: Reverting changes from 3405 so that I can do this the correct way.

git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@3411 5390a7c7-147a-4af0-8ec9-7488f05a26cb
---
 wcte12xp/base.c      | 10 ++--------
 wcte12xp/vpmadt032.c | 12 ++++++------
 wcte12xp/vpmadt032.h |  2 +-
 3 files changed, 9 insertions(+), 15 deletions(-)

(limited to 'wcte12xp')

diff --git a/wcte12xp/base.c b/wcte12xp/base.c
index 1bd6c5b..26598be 100644
--- a/wcte12xp/base.c
+++ b/wcte12xp/base.c
@@ -1425,10 +1425,7 @@ static int t1_hardware_post_init(struct t1 *wc)
 	t1_setleds(wc, wc->ledtestreg, 0);
 
 #ifdef VPM_SUPPORT
-	if (t1_vpm150m_init(wc) < 0) {
-		module_printk("VPMADT032 module detected but there was an error during initialization.  If you still wish to use this card, please disable echo cancellation using vpmsupport=0 as a module parameter or replace the echo cancellation module.\n");
-		return -1;
-	}
+	t1_vpm150m_init(wc);
 	if (wc->vpm150m) {
 		module_printk("VPM present and operational (Firmware version %x)\n", wc->vpm150m->version);
 		wc->ctlreg |= 0x10; /* turn on vpm (RX audio from vpm module) */
@@ -1958,10 +1955,7 @@ static int __devinit te12xp_init_one(struct pci_dev *pdev, const struct pci_devi
 	
 	t1_enable_interrupts(wc);
 	t1_start_dma(wc);
-	if (t1_hardware_post_init(wc) < 0) {
-		module_printk("Hardware init failed.  Refusing to register broken hardware interface.\n");
-		return 0;
-	}
+	t1_hardware_post_init(wc);
 	t1_software_init(wc);
 	module_printk("Found a %s\n", wc->variety);
 
diff --git a/wcte12xp/vpmadt032.c b/wcte12xp/vpmadt032.c
index 90af94c..ca15e7c 100644
--- a/wcte12xp/vpmadt032.c
+++ b/wcte12xp/vpmadt032.c
@@ -641,7 +641,7 @@ static void vpm150m_dtmf_bh(struct work_struct *data)
 	return;
 }
 
-int t1_vpm150m_init(struct t1 *wc) {	
+void t1_vpm150m_init(struct t1 *wc) {	
 	struct vpm150m *vpm150m;
 	unsigned short i;
 	unsigned short reg;
@@ -666,14 +666,14 @@ int t1_vpm150m_init(struct t1 *wc) {
 	if (!vpmsupport) {
 		module_printk("VPM Support Disabled\n");
 		wc->vpm150m = NULL;
-		return 0; /* not fatal for the card */
+		return;
 	}
 
 	vpm150m = kmalloc(sizeof(struct vpm150m), GFP_KERNEL);
 
 	if (!vpm150m) {
 		module_printk("Unable to allocate VPMADT032!\n");
-		return -1;
+		return;
 	}
 	memset(vpm150m, 0, sizeof(struct vpm150m));
 	
@@ -873,7 +873,7 @@ int t1_vpm150m_init(struct t1 *wc) {
 		if ((request_firmware(&firmware, vpmadt032_firmware, &wc->dev->dev) != 0) ||
 		    !firmware) {
 			printk("VPMADT032: firmware %s not available from userspace\n", vpmadt032_firmware);
-			return -1;
+			return;
 		}
 #else
 		embedded_firmware.data = _binary_vpmadt032_bin_start;
@@ -942,7 +942,7 @@ int t1_vpm150m_init(struct t1 *wc) {
 		goto failed_exit;
 	}
 
-	return 0;
+	return;
 
 failed_exit:
 	spin_lock_irqsave(&wc->reglock, flags);
@@ -950,7 +950,7 @@ failed_exit:
 	spin_unlock_irqrestore(&wc->reglock, flags);
 	kfree(vpm150m);
 
-	return -1;
+	return;
 }
 
 /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/wcte12xp/vpmadt032.h b/wcte12xp/vpmadt032.h
index 4f9a5dc..55620f1 100644
--- a/wcte12xp/vpmadt032.h
+++ b/wcte12xp/vpmadt032.h
@@ -112,7 +112,7 @@ extern int vpmsupport;
 extern int vpmdtmfsupport;
 extern struct pci_driver te12xp_driver;
 
-int t1_vpm150m_init(struct t1 *wc);
+void t1_vpm150m_init(struct t1 *wc);
 void vpm150m_cmd_dequeue(struct t1 *wc, volatile unsigned char *writechunk, int whichframe);
 void vpm150m_cmd_decipher(struct t1 *wc, volatile unsigned char *readchunk);
 int vpm150m_config_hw(struct t1 *wc);
-- 
cgit v1.2.3