[svn-commits] sruffell: branch linux/2.4 r9755 - /linux/branches/2.4/drivers/dahdi/wct4xxp/

[SVN commits to the Digium repositories]

Author: sruffell
Date: Thu Feb 10 10:29:52 2011
New Revision: 9755

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9755
Log:
wct4xxp: Do not lock interrupts while loading the VPM firmware.

Since the oct6100 API consumes less stack there is no longer a danger of
overflowing our stack during load.

Signed-off-by: Shaun Ruffell <sruffell at digium.com>

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=9752

Modified:
    linux/branches/2.4/drivers/dahdi/wct4xxp/vpm450m.c

Modified: linux/branches/2.4/drivers/dahdi/wct4xxp/vpm450m.c
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.4/drivers/dahdi/wct4xxp/vpm450m.c?view=diff&rev=9755&r1=9754&r2=9755
==============================================================================
--- linux/branches/2.4/drivers/dahdi/wct4xxp/vpm450m.c (original)
+++ linux/branches/2.4/drivers/dahdi/wct4xxp/vpm450m.c Thu Feb 10 10:29:52 2011
@@ -425,9 +425,6 @@
 	UINT32 ulResult;
 	struct vpm450m *vpm450m;
 	int x,y,law;
-#ifdef CONFIG_4KSTACKS
-	unsigned long flags;
-#endif
 	
 	if (!(vpm450m = kmalloc(sizeof(struct vpm450m), GFP_KERNEL)))
 		return NULL;
@@ -502,20 +499,9 @@
 		return NULL;
 	}
 
-	/* I don't know what to curse more in this comment, the problems caused by
-	 * the 4K kernel stack limit change or the octasic API for being so darn
-	 * stack unfriendly.  Stupid, stupid, stupid.  So we disable IRQs so we
-	 * don't run the risk of overflowing the stack while we initialize the
-	 * octasic. */
-#ifdef CONFIG_4KSTACKS
-	local_irq_save(flags);
-#endif
 	ulResult = Oct6100ChipOpen(vpm450m->pApiInstance, ChipOpen);
 	if (ulResult != cOCT6100_ERR_OK) {
 		printk(KERN_NOTICE "Failed to open chip, code %08x!\n", ulResult);
-#ifdef CONFIG_4KSTACKS
-		local_irq_restore(flags);
-#endif
 		vfree(vpm450m->pApiInstance);
 		kfree(vpm450m);
 		kfree(ChipOpen);
@@ -572,9 +558,6 @@
 		}
 	}
 
-#ifdef CONFIG_4KSTACKS
-	local_irq_restore(flags);
-#endif
 	kfree(ChipOpen);
 	kfree(ChannelOpen);
 	return vpm450m;