- crap removal

1 files changed, 96 insertions, 122 deletions

diff --git a/linux/drivers/media/dvb/b2c2/skystar2.c b/linux/drivers/media/dvb/b2c2/skystar2.c
index 8d59309a3..21f95cc6a 100644
--- a/linux/drivers/media/dvb/b2c2/skystar2.c
+++ b/linux/drivers/media/dvb/b2c2/skystar2.c
@@ -41,7 +41,7 @@ int debug = 0;
 #define SizeOfBufDMA1	0x3AC00
 #define SizeOfBufDMA2	0x758
 
-struct DmaQ {
+struct dmaq {
 
 	u32 bus_addr;
 	u32 head;
@@ -50,7 +50,7 @@ struct DmaQ {
 	u8 *buffer;
 };
 
-struct packet_header_t {
+struct packet_header {
 
 	u32 sync_byte;
 	u32 transport_error_indicator;
@@ -86,8 +86,8 @@ struct adapter {
 
 	struct semaphore i2c_sem;
 
-	struct DmaQ DmaQ1;
-	struct DmaQ DmaQ2;
+	struct dmaq dmaq1;
+	struct dmaq dmaq2;
 
 	u32 dma_ctrl;
 	u32 dma_status;
@@ -100,32 +100,8 @@ struct adapter {
 	u32 mac_filter;
 };
 
-
-void linuxdelayms(u32 usecs)
-{
-	while (usecs > 0) {
-		udelay(1000);
-
-		usecs--;
-	}
-}
-
-void WriteRegDW(struct adapter *adapter, u32 reg, u32 value)
-{
-	u32 flags;
-
-	save_flags(flags);
-	cli();
-
-	writel(value, adapter->io_mem + reg);
-
-	restore_flags(flags);
-}
-
-u32 ReadRegDW(struct adapter *adapter, u32 reg)
-{
-	return readl(adapter->io_mem + reg);
-}
+#define WriteRegDW(adapter,reg,value) writel(value, adapter->io_mem + reg)
+#define ReadRegDW(adapter,reg) readl(adapter->io_mem + reg)
 
 u32 WriteRegOp(struct adapter * adapter, u32 reg, u32 operation, u32 andvalue, u32 orvalue)
 {
@@ -164,7 +140,6 @@ u32 i2cMainWriteForFlex2(struct adapter * adapter, u32 command, u8 * buf, u32 re
 
 				return 1;
 			}
-
 		} else {
 
 			WriteRegDW(adapter, 0x100, 0);
@@ -359,9 +334,9 @@ static int master_xfer(struct dvb_i2c_bus *i2c, const struct i2c_msg *msgs, int
 
 	up(&tmp->i2c_sem);
 
-	// master xfer functions always return the number of successfully
-	// transmitted messages, not the number of transmitted bytes.
-	// return -EREMOTEIO in case of failure.
+	/* master xfer functions always return the number of successfully
+	   transmitted messages, not the number of transmitted bytes.
+	   return -EREMOTEIO in case of failure. */
 	return ret;
 }
 
@@ -461,7 +436,7 @@ void FlexSramWrite(struct adapter *adapter, u32 bank, u32 addr, u8 * buf, u32 le
 		retries = 2;
 
 		while (((ReadRegDW(adapter, 0x700) & 0x80000000) != 0) && (retries > 0)) {
-			linuxdelayms(1);
+			mdelay(1);
 			retries--;
 		};
 
@@ -485,7 +460,7 @@ void FlexSramRead(struct adapter *adapter, u32 bank, u32 addr, u8 * buf, u32 len
 		retries = 10000;
 
 		while (((ReadRegDW(adapter, 0x700) & 0x80000000) != 0) && (retries > 0)) {
-			linuxdelayms(1);
+			mdelay(1);
 			retries--;
 		};
 
@@ -497,7 +472,7 @@ void FlexSramRead(struct adapter *adapter, u32 bank, u32 addr, u8 * buf, u32 len
 		retries = 10000;
 
 		while (((ReadRegDW(adapter, 0x700) & 0x80000000) != 0) && (retries > 0)) {
-			linuxdelayms(1);
+			mdelay(1);
 			retries--;
 		};
 
@@ -644,7 +619,7 @@ int SRAM_testLocation(struct adapter *adapter, u32 mask, u32 addr)
 
 	tmp2 = 0;
 
-	linuxdelayms(20);
+	mdelay(20);
 
 	SRAM_read(adapter, addr, &tmp2, 1);
 	SRAM_read(adapter, addr, &tmp2, 1);
@@ -662,7 +637,7 @@ int SRAM_testLocation(struct adapter *adapter, u32 mask, u32 addr)
 
 	tmp2 = 0;
 
-	linuxdelayms(20);
+	mdelay(20);
 
 	SRAM_read(adapter, addr, &tmp2, 1);
 	SRAM_read(adapter, addr, &tmp2, 1);
@@ -1577,11 +1552,11 @@ int DmaInitDMA(struct adapter *adapter, u32 dma_channel)
 
 		subbuffers = 2;
 
-		subbufsize = (((adapter->DmaQ1.buffer_size / 2) / 4) << 8) | subbuffers;
+		subbufsize = (((adapter->dmaq1.buffer_size / 2) / 4) << 8) | subbuffers;
 
-		subbuf0 = adapter->DmaQ1.bus_addr & 0xFFFFFFFC;
+		subbuf0 = adapter->dmaq1.bus_addr & 0xFFFFFFFC;
 
-		subbuf1 = ((adapter->DmaQ1.bus_addr + adapter->DmaQ1.buffer_size / 2) & 0xFFFFFFFC) | 1;
+		subbuf1 = ((adapter->dmaq1.bus_addr + adapter->dmaq1.buffer_size / 2) & 0xFFFFFFFC) | 1;
 
 		dprintk("%s: first subbuffer address = 0x%x\n", __FUNCTION__, subbuf0);
 		udelay(1000);
@@ -1595,8 +1570,8 @@ int DmaInitDMA(struct adapter *adapter, u32 dma_channel)
 		udelay(1000);
 		WriteRegDW(adapter, 0x00C, subbuf1);
 
-		dprintk("%s: counter = 0x%x\n", __FUNCTION__, adapter->DmaQ1.bus_addr & 0xFFFFFFFC);
-		WriteRegDW(adapter, 0x008, adapter->DmaQ1.bus_addr & 0xFFFFFFFC);
+		dprintk("%s: counter = 0x%x\n", __FUNCTION__, adapter->dmaq1.bus_addr & 0xFFFFFFFC);
+		WriteRegDW(adapter, 0x008, adapter->dmaq1.bus_addr & 0xFFFFFFFC);
 		udelay(1000);
 
 		if (subbuffers == 0)
@@ -1617,11 +1592,11 @@ int DmaInitDMA(struct adapter *adapter, u32 dma_channel)
 
 		subbuffers = 2;
 
-		subbufsize = (((adapter->DmaQ2.buffer_size / 2) / 4) << 8) | subbuffers;
+		subbufsize = (((adapter->dmaq2.buffer_size / 2) / 4) << 8) | subbuffers;
 
-		subbuf0 = adapter->DmaQ2.bus_addr & 0xFFFFFFFC;
+		subbuf0 = adapter->dmaq2.bus_addr & 0xFFFFFFFC;
 
-		subbuf1 = ((adapter->DmaQ2.bus_addr + adapter->DmaQ2.buffer_size / 2) & 0xFFFFFFFC) | 1;
+		subbuf1 = ((adapter->dmaq2.bus_addr + adapter->dmaq2.buffer_size / 2) & 0xFFFFFFFC) | 1;
 
 		dprintk("%s: first subbuffer address = 0x%x\n", __FUNCTION__, subbuf0);
 		udelay(1000);
@@ -1671,20 +1646,20 @@ void DmaStartStop0x2102(struct adapter *adapter, u32 dma_mask, u32 start_stop)
 		dma1_enable = 0;
 		dma2_enable = 0;
 
-		if (((dma_mask & 1) != 0) && ((adapter->dma_status & 1) == 0) && (adapter->DmaQ1.bus_addr != 0)) {
+		if (((dma_mask & 1) != 0) && ((adapter->dma_status & 1) == 0) && (adapter->dmaq1.bus_addr != 0)) {
 			adapter->dma_status = adapter->dma_status | 1;
 			dma1_enable = 1;
 		}
 
-		if (((dma_mask & 2) != 0) && ((adapter->dma_status & 2) == 0) && (adapter->DmaQ2.bus_addr != 0)) {
+		if (((dma_mask & 2) != 0) && ((adapter->dma_status & 2) == 0) && (adapter->dmaq2.bus_addr != 0)) {
 			adapter->dma_status = adapter->dma_status | 2;
 			dma2_enable = 1;
 		}
 		// enable dma1 and dma2
 		if ((dma1_enable == 1) && (dma2_enable == 1)) {
-			WriteRegDW(adapter, 0x000, adapter->DmaQ1.bus_addr | 1);
-			WriteRegDW(adapter, 0x00C, (adapter->DmaQ1.bus_addr + adapter->DmaQ1.buffer_size / 2) | 1);
-			WriteRegDW(adapter, 0x010, adapter->DmaQ2.bus_addr | 1);
+			WriteRegDW(adapter, 0x000, adapter->dmaq1.bus_addr | 1);
+			WriteRegDW(adapter, 0x00C, (adapter->dmaq1.bus_addr + adapter->dmaq1.buffer_size / 2) | 1);
+			WriteRegDW(adapter, 0x010, adapter->dmaq2.bus_addr | 1);
 
 			CtrlEnableReceiveData(adapter, 1);
 
@@ -1692,8 +1667,8 @@ void DmaStartStop0x2102(struct adapter *adapter, u32 dma_mask, u32 start_stop)
 		}
 		// enable dma1
 		if ((dma1_enable == 1) && (dma2_enable == 0)) {
-			WriteRegDW(adapter, 0x000, adapter->DmaQ1.bus_addr | 1);
-			WriteRegDW(adapter, 0x00C, (adapter->DmaQ1.bus_addr + adapter->DmaQ1.buffer_size / 2) | 1);
+			WriteRegDW(adapter, 0x000, adapter->dmaq1.bus_addr | 1);
+			WriteRegDW(adapter, 0x00C, (adapter->dmaq1.bus_addr + adapter->dmaq1.buffer_size / 2) | 1);
 
 			CtrlEnableReceiveData(adapter, 1);
 
@@ -1701,7 +1676,7 @@ void DmaStartStop0x2102(struct adapter *adapter, u32 dma_mask, u32 start_stop)
 		}
 		// enable dma2
 		if ((dma1_enable == 0) && (dma2_enable == 1)) {
-			WriteRegDW(adapter, 0x010, adapter->DmaQ2.bus_addr | 1);
+			WriteRegDW(adapter, 0x010, adapter->dmaq2.bus_addr | 1);
 
 			CtrlEnableReceiveData(adapter, 1);
 
@@ -1734,15 +1709,15 @@ void DmaStartStop0x2102(struct adapter *adapter, u32 dma_mask, u32 start_stop)
 			udelay(3000);
 		}
 		//disable dma1
-		if (((dma_mask & 1) != 0) && ((adapter->dma_status & 1) != 0) && (adapter->DmaQ1.bus_addr != 0)) {
-			WriteRegDW(adapter, 0x000, adapter->DmaQ1.bus_addr);
-			WriteRegDW(adapter, 0x00C, (adapter->DmaQ1.bus_addr + adapter->DmaQ1.buffer_size / 2) | 1);
+		if (((dma_mask & 1) != 0) && ((adapter->dma_status & 1) != 0) && (adapter->dmaq1.bus_addr != 0)) {
+			WriteRegDW(adapter, 0x000, adapter->dmaq1.bus_addr);
+			WriteRegDW(adapter, 0x00C, (adapter->dmaq1.bus_addr + adapter->dmaq1.buffer_size / 2) | 1);
 
 			adapter->dma_status = adapter->dma_status & ~0x00000001;
 		}
 		//disable dma2
-		if (((dma_mask & 2) != 0) && ((adapter->dma_status & 2) != 0) && (adapter->DmaQ2.bus_addr != 0)) {
-			WriteRegDW(adapter, 0x010, adapter->DmaQ2.bus_addr);
+		if (((dma_mask & 2) != 0) && ((adapter->dma_status & 2) != 0) && (adapter->dmaq2.bus_addr != 0)) {
+			WriteRegDW(adapter, 0x010, adapter->dmaq2.bus_addr);
 
 			adapter->dma_status = adapter->dma_status & ~0x00000002;
 		}
@@ -1768,17 +1743,17 @@ void OpenStream(struct adapter *adapter, u32 pid)
 		if (((adapter->dma_status & 0x10000000) != 0) && ((adapter->dma_status & 1) == 0)) {
 			dma_mask = dma_mask | 1;
 
-			adapter->DmaQ1.head = 0;
-			adapter->DmaQ1.tail = 0;
+			adapter->dmaq1.head = 0;
+			adapter->dmaq1.tail = 0;
 
-			memset(adapter->DmaQ1.buffer, 0, adapter->DmaQ1.buffer_size);
+			memset(adapter->dmaq1.buffer, 0, adapter->dmaq1.buffer_size);
 		}
 
 		if (((adapter->dma_status & 0x20000000) != 0) && ((adapter->dma_status & 2) == 0)) {
 			dma_mask = dma_mask | 2;
 
-			adapter->DmaQ2.head = 0;
-			adapter->DmaQ2.tail = 0;
+			adapter->dmaq2.head = 0;
+			adapter->dmaq2.tail = 0;
 		}
 
 		if (dma_mask != 0) {
@@ -1815,7 +1790,7 @@ void CloseStream(struct adapter *adapter, u32 pid)
 u32 InterruptServiceDMA1(struct adapter *adapter)
 {
 	struct dvb_demux *dvbdmx = &adapter->demux;
-	struct packet_header_t packet_header;
+	struct packet_header packet_header;
 
 	int nCurDmaCounter;
 	u32 nNumBytesParsed;
@@ -1824,27 +1799,27 @@ u32 InterruptServiceDMA1(struct adapter *adapter)
 	u8 gbTmpBuffer[188];
 	u8 *pbDMABufCurPos;
 
-	nCurDmaCounter = readl(adapter->io_mem + 0x008) - adapter->DmaQ1.bus_addr;
+	nCurDmaCounter = readl(adapter->io_mem + 0x008) - adapter->dmaq1.bus_addr;
 	nCurDmaCounter = (nCurDmaCounter / dwDefaultPacketSize) * dwDefaultPacketSize;
 
-	if ((nCurDmaCounter < 0) || (nCurDmaCounter > adapter->DmaQ1.buffer_size)) {
+	if ((nCurDmaCounter < 0) || (nCurDmaCounter > adapter->dmaq1.buffer_size)) {
 		dprintk("%s: dma counter outside dma buffer\n", __FUNCTION__);
 
 		return 1;
 	}
 
-	adapter->DmaQ1.head = nCurDmaCounter;
+	adapter->dmaq1.head = nCurDmaCounter;
 
-	if (adapter->DmaQ1.tail <= nCurDmaCounter) {
-		nNumNewBytesTransferred = nCurDmaCounter - adapter->DmaQ1.tail;
+	if (adapter->dmaq1.tail <= nCurDmaCounter) {
+		nNumNewBytesTransferred = nCurDmaCounter - adapter->dmaq1.tail;
 
 	} else {
 
-		nNumNewBytesTransferred = (adapter->DmaQ1.buffer_size - adapter->DmaQ1.tail) + nCurDmaCounter;
+		nNumNewBytesTransferred = (adapter->dmaq1.buffer_size - adapter->dmaq1.tail) + nCurDmaCounter;
 	}
 
 //  dprintk("%s: nCurDmaCounter   = %d\n" , __FUNCTION__, nCurDmaCounter);
-//  dprintk("%s: DmaQ1.tail       = %d\n" , __FUNCTION__, adapter->DmaQ1.tail):
+//  dprintk("%s: dmaq1.tail       = %d\n" , __FUNCTION__, adapter->dmaq1.tail):
 //  dprintk("%s: BytesTransferred = %d\n" , __FUNCTION__, nNumNewBytesTransferred);
 
 	if (nNumNewBytesTransferred < dwDefaultPacketSize)
@@ -1853,11 +1828,11 @@ u32 InterruptServiceDMA1(struct adapter *adapter)
 	nNumBytesParsed = 0;
 
 	while (nNumBytesParsed < nNumNewBytesTransferred) {
-		pbDMABufCurPos = adapter->DmaQ1.buffer + adapter->DmaQ1.tail;
+		pbDMABufCurPos = adapter->dmaq1.buffer + adapter->dmaq1.tail;
 
-		if (adapter->DmaQ1.buffer + adapter->DmaQ1.buffer_size < adapter->DmaQ1.buffer + adapter->DmaQ1.tail + 188) {
-			memcpy(gbTmpBuffer, adapter->DmaQ1.buffer + adapter->DmaQ1.tail, adapter->DmaQ1.buffer_size - adapter->DmaQ1.tail);
-			memcpy(gbTmpBuffer + (adapter->DmaQ1.buffer_size - adapter->DmaQ1.tail), adapter->DmaQ1.buffer, (188 - (adapter->DmaQ1.buffer_size - adapter->DmaQ1.tail)));
+		if (adapter->dmaq1.buffer + adapter->dmaq1.buffer_size < adapter->dmaq1.buffer + adapter->dmaq1.tail + 188) {
+			memcpy(gbTmpBuffer, adapter->dmaq1.buffer + adapter->dmaq1.tail, adapter->dmaq1.buffer_size - adapter->dmaq1.tail);
+			memcpy(gbTmpBuffer + (adapter->dmaq1.buffer_size - adapter->dmaq1.tail), adapter->dmaq1.buffer, (188 - (adapter->dmaq1.buffer_size - adapter->dmaq1.tail)));
 
 			pbDMABufCurPos = gbTmpBuffer;
 		}
@@ -1887,10 +1862,10 @@ u32 InterruptServiceDMA1(struct adapter *adapter)
 
 		nNumBytesParsed = nNumBytesParsed + dwDefaultPacketSize;
 
-		adapter->DmaQ1.tail = adapter->DmaQ1.tail + dwDefaultPacketSize;
+		adapter->dmaq1.tail = adapter->dmaq1.tail + dwDefaultPacketSize;
 
-		if (adapter->DmaQ1.tail >= adapter->DmaQ1.buffer_size)
-			adapter->DmaQ1.tail = adapter->DmaQ1.tail - adapter->DmaQ1.buffer_size;
+		if (adapter->dmaq1.tail >= adapter->dmaq1.buffer_size)
+			adapter->dmaq1.tail = adapter->dmaq1.tail - adapter->dmaq1.buffer_size;
 	};
 
 	return 1;
@@ -1922,56 +1897,56 @@ void isr(int irq, void *dev_id, struct pt_regs *regs)
 }
 
 
-void InitDmaQueue(struct adapter *adapter)
+void Initdmaqueue(struct adapter *adapter)
 {
 	dma_addr_t dma_addr;
 
-	if (adapter->DmaQ1.buffer != 0)
+	if (adapter->dmaq1.buffer != 0)
 		return;
 
-	adapter->DmaQ1.head = 0;
-	adapter->DmaQ1.tail = 0;
-	adapter->DmaQ1.buffer = 0;
+	adapter->dmaq1.head = 0;
+	adapter->dmaq1.tail = 0;
+	adapter->dmaq1.buffer = 0;
 
-	adapter->DmaQ1.buffer = pci_alloc_consistent(adapter->pdev, SizeOfBufDMA1 + 0x80, &dma_addr);
+	adapter->dmaq1.buffer = pci_alloc_consistent(adapter->pdev, SizeOfBufDMA1 + 0x80, &dma_addr);
 
-	if (adapter->DmaQ1.buffer != 0) {
-		memset(adapter->DmaQ1.buffer, 0, SizeOfBufDMA1);
+	if (adapter->dmaq1.buffer != 0) {
+		memset(adapter->dmaq1.buffer, 0, SizeOfBufDMA1);
 
-		adapter->DmaQ1.bus_addr = dma_addr;
-		adapter->DmaQ1.buffer_size = SizeOfBufDMA1;
+		adapter->dmaq1.bus_addr = dma_addr;
+		adapter->dmaq1.buffer_size = SizeOfBufDMA1;
 
 		DmaInitDMA(adapter, 0);
 
 		adapter->dma_status = adapter->dma_status | 0x10000000;
 
-		dprintk("%s: allocated dma buffer at 0x%x, length=%d\n", __FUNCTION__, (int) adapter->DmaQ1.buffer, SizeOfBufDMA1);
+		dprintk("%s: allocated dma buffer at 0x%x, length=%d\n", __FUNCTION__, (int) adapter->dmaq1.buffer, SizeOfBufDMA1);
 
 	} else {
 
 		adapter->dma_status = adapter->dma_status & ~0x10000000;
 	}
 
-	if (adapter->DmaQ2.buffer != 0)
+	if (adapter->dmaq2.buffer != 0)
 		return;
 
-	adapter->DmaQ2.head = 0;
-	adapter->DmaQ2.tail = 0;
-	adapter->DmaQ2.buffer = 0;
+	adapter->dmaq2.head = 0;
+	adapter->dmaq2.tail = 0;
+	adapter->dmaq2.buffer = 0;
 
-	adapter->DmaQ2.buffer = pci_alloc_consistent(adapter->pdev, SizeOfBufDMA2 + 0x80, &dma_addr);
+	adapter->dmaq2.buffer = pci_alloc_consistent(adapter->pdev, SizeOfBufDMA2 + 0x80, &dma_addr);
 
-	if (adapter->DmaQ2.buffer != 0) {
-		memset(adapter->DmaQ2.buffer, 0, SizeOfBufDMA2);
+	if (adapter->dmaq2.buffer != 0) {
+		memset(adapter->dmaq2.buffer, 0, SizeOfBufDMA2);
 
-		adapter->DmaQ2.bus_addr = dma_addr;
-		adapter->DmaQ2.buffer_size = SizeOfBufDMA2;
+		adapter->dmaq2.bus_addr = dma_addr;
+		adapter->dmaq2.buffer_size = SizeOfBufDMA2;
 
 		DmaInitDMA(adapter, 1);
 
 		adapter->dma_status = adapter->dma_status | 0x20000000;
 
-		dprintk("%s: allocated dma buffer at 0x%x, length=%d\n", __FUNCTION__, (int) adapter->DmaQ2.buffer, (int) SizeOfBufDMA2);
+		dprintk("%s: allocated dma buffer at 0x%x, length=%d\n", __FUNCTION__, (int) adapter->dmaq2.buffer, (int) SizeOfBufDMA2);
 
 	} else {
 
@@ -1979,26 +1954,26 @@ void InitDmaQueue(struct adapter *adapter)
 	}
 }
 
-void FreeDmaQueue(struct adapter *adapter)
+void Freedmaqueue(struct adapter *adapter)
 {
-	if (adapter->DmaQ1.buffer != 0) {
-		pci_free_consistent(adapter->pdev, SizeOfBufDMA1 + 0x80, adapter->DmaQ1.buffer, adapter->DmaQ1.bus_addr);
+	if (adapter->dmaq1.buffer != 0) {
+		pci_free_consistent(adapter->pdev, SizeOfBufDMA1 + 0x80, adapter->dmaq1.buffer, adapter->dmaq1.bus_addr);
 
-		adapter->DmaQ1.bus_addr = 0;
-		adapter->DmaQ1.head = 0;
-		adapter->DmaQ1.tail = 0;
-		adapter->DmaQ1.buffer_size = 0;
-		adapter->DmaQ1.buffer = 0;
+		adapter->dmaq1.bus_addr = 0;
+		adapter->dmaq1.head = 0;
+		adapter->dmaq1.tail = 0;
+		adapter->dmaq1.buffer_size = 0;
+		adapter->dmaq1.buffer = 0;
 	}
 
-	if (adapter->DmaQ2.buffer != 0) {
-		pci_free_consistent(adapter->pdev, SizeOfBufDMA2 + 0x80, adapter->DmaQ2.buffer, adapter->DmaQ2.bus_addr);
+	if (adapter->dmaq2.buffer != 0) {
+		pci_free_consistent(adapter->pdev, SizeOfBufDMA2 + 0x80, adapter->dmaq2.buffer, adapter->dmaq2.bus_addr);
 
-		adapter->DmaQ2.bus_addr = 0;
-		adapter->DmaQ2.head = 0;
-		adapter->DmaQ2.tail = 0;
-		adapter->DmaQ2.buffer_size = 0;
-		adapter->DmaQ2.buffer = 0;
+		adapter->dmaq2.bus_addr = 0;
+		adapter->dmaq2.head = 0;
+		adapter->dmaq2.tail = 0;
+		adapter->dmaq2.buffer_size = 0;
+		adapter->dmaq2.buffer = 0;
 	}
 }
 
@@ -2011,7 +1986,7 @@ void FreeAdapterObject(struct adapter *adapter)
 	if (adapter->irq != 0)
 		free_irq(adapter->irq, adapter);
 
-	FreeDmaQueue(adapter);
+	Freedmaqueue(adapter);
 
 	if (adapter->io_mem != 0)
 		iounmap((void *) adapter->io_mem);
@@ -2118,7 +2093,7 @@ u32 DriverInitialize(struct pci_dev * pdev)
 	PidSetEcmPID(adapter, 0x1FFF);
 	PidSetEmmPID(adapter, 0x1FFF);
 
-	InitDmaQueue(adapter);
+	Initdmaqueue(adapter);
 
 	if ((adapter->dma_status & 0x30000000) == 0) {
 		FreeAdapterObject(adapter);
@@ -2141,10 +2116,10 @@ u32 DriverInitialize(struct pci_dev * pdev)
 	tmp = ReadRegDW(adapter, 0x204);
 
 	WriteRegDW(adapter, 0x204, 0);
-	linuxdelayms(20);
+	mdelay(20);
 
 	WriteRegDW(adapter, 0x204, tmp);
-	linuxdelayms(10);
+	mdelay(10);
 
 	tmp = ReadRegDW(adapter, 0x308);
 	WriteRegDW(adapter, 0x308, 0x4000 | tmp);
@@ -2175,8 +2150,7 @@ u32 DriverInitialize(struct pci_dev * pdev)
 
 	EEPROM_readKey(adapter, key, 16);
 
-	printk("%s key = \n %02x %02x %02x %02x \n %02x %02x %02x %02x \n %02x %02x %02x %02x \n %02x %02x %02x %02x \n", __FUNCTION__, key[0], key[1], key[2], key[3], key[4], key[5], key[6], key[7], key[8], key[9], key[10], key[11], key[12], key[13], key[14], key[15]
-	    );
+	printk("%s key = \n %02x %02x %02x %02x \n %02x %02x %02x %02x \n %02x %02x %02x %02x \n %02x %02x %02x %02x \n", __FUNCTION__, key[0], key[1], key[2], key[3], key[4], key[5], key[6], key[7], key[8], key[9], key[10], key[11], key[12], key[13], key[14], key[15]);
 
 	adapter->lock = SPIN_LOCK_UNLOCKED;