[dahdi-commits] sruffell: linux/trunk r9325 - /linux/trunk/drivers/dahdi/voicebus/voicebus.c

[SVN commits to the DAHDI project]

Author: sruffell
Date: Tue Sep 14 09:02:34 2010
New Revision: 9325

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9325
Log:
wcte12xp, wctdm24xxp: Remove redundant vb_enable_io_access.

These three bits are already set by 'pci_enable_device' and
'pci_set_master' calls.

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

Modified:
    linux/trunk/drivers/dahdi/voicebus/voicebus.c

Modified: linux/trunk/drivers/dahdi/voicebus/voicebus.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/voicebus/voicebus.c?view=diff&rev=9325&r1=9324&r2=9325
==============================================================================
--- linux/trunk/drivers/dahdi/voicebus/voicebus.c (original)
+++ linux/trunk/drivers/dahdi/voicebus/voicebus.c Tue Sep 14 09:02:34 2010
@@ -626,19 +626,6 @@
 	bits = (0x5 << 12) | (1 << 7) | (addr << 2) | 0x2;
 	__vb_sdi_sendbits(vb, bits, 16, &sdi);
 	__vb_sdi_sendbits(vb, val, 16, &sdi);
-	spin_unlock_irqrestore(&vb->lock, flags);
-}
-
-static void
-vb_enable_io_access(struct voicebus *vb)
-{
-	u32 reg;
-	unsigned long flags;
-	BUG_ON(!vb->pdev);
-	spin_lock_irqsave(&vb->lock, flags);
-	pci_read_config_dword(vb->pdev, 0x0004, &reg);
-	reg |= 0x00000007;
-	pci_write_config_dword(vb->pdev, 0x0004, reg);
 	spin_unlock_irqrestore(&vb->lock, flags);
 }
 
@@ -1799,7 +1786,6 @@
 	}
 
 	pci_set_master(vb->pdev);
-	vb_enable_io_access(vb);
 
 	if (vb_reset_interface(vb)) {
 		retval = -EIO;