patch-2.3.27 linux/drivers/scsi/inia100.c

• Lines: 411
• Date: Thu Nov 11 16:57:30 1999
• Orig file: v2.3.26/linux/drivers/scsi/inia100.c
• Orig date: Fri Sep 10 23:57:31 1999

diff -u --recursive --new-file v2.3.26/linux/drivers/scsi/inia100.c linux/drivers/scsi/inia100.c
@@ -71,56 +71,27 @@
 #include <linux/module.h>
 #endif
 
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(1,3,0)
 #include <stdarg.h>
-#include <asm/io.h>
 #include <asm/irq.h>
-#include <linux/string.h>
 #include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/ioport.h>
 #include <linux/delay.h>
-#include <linux/sched.h>
-#if LINUX_VERSION_CODE <= CVT_LINUX_VERSION(2,1,92)
-#include <linux/bios32.h>
-#endif
 #include <linux/pci.h>
-#include <linux/proc_fs.h>
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(2,1,23)
 #include <linux/init.h>
-#endif
 #include <linux/blk.h>
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(2,1,95)
 #include <linux/spinlock.h>
-#endif
-#include "sd.h"
-#include "scsi.h"
-#include "hosts.h"
-#include "inia100.h"
 #include <linux/stat.h>
-#include <linux/malloc.h>
 #include <linux/config.h>
-
-
-#else
-
 #include <linux/kernel.h>
-#include <linux/head.h>
-#include <linux/types.h>
 #include <linux/string.h>
 #include <linux/ioport.h>
-
 #include <linux/sched.h>
 #include <linux/proc_fs.h>
-#include <asm/system.h>
 #include <asm/io.h>
-#include "../block/blk.h"
 #include "scsi.h"
 #include "sd.h"
 #include "hosts.h"
 #include <linux/malloc.h>
 #include "inia100.h"
-#endif
 
 #ifdef MODULE
 Scsi_Host_Template driver_template = INIA100;
@@ -134,15 +105,6 @@
 char *inia100_ProductName = "INI-A100U2W";
 char *inia100_Version = "v1.02c";
 
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(1,3,0)
-struct proc_dir_entry proc_scsi_inia100 =
-{
-	PROC_SCSI_INIA100, 7, "INIA100",
-	S_IFDIR | S_IRUGO | S_IXUGO, 2,
-	0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL
-};
-#endif
-
 /* set by inia100_setup according to the command line */
 static int setup_called = 0;
 static int orc_num_ch = MAX_SUPPORTED_ADAPTERS;		/* Maximum 4 adapters           */
@@ -151,7 +113,6 @@
 #define NUMBER(arr)     (sizeof(arr) / sizeof(arr[0]))
 static char *setup_str = (char *) NULL;
 
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(1,3,0)
 static void inia100_intr0(int irq, void *dev_id, struct pt_regs *);
 static void inia100_intr1(int irq, void *dev_id, struct pt_regs *);
 static void inia100_intr2(int irq, void *dev_id, struct pt_regs *);
@@ -160,16 +121,6 @@
 static void inia100_intr5(int irq, void *dev_id, struct pt_regs *);
 static void inia100_intr6(int irq, void *dev_id, struct pt_regs *);
 static void inia100_intr7(int irq, void *dev_id, struct pt_regs *);
-#else
-static void inia100_intr0(int irq, struct pt_regs *);
-static void inia100_intr1(int irq, struct pt_regs *);
-static void inia100_intr2(int irq, struct pt_regs *);
-static void inia100_intr3(int irq, struct pt_regs *);
-static void inia100_intr4(int irq, struct pt_regs *);
-static void inia100_intr5(int irq, struct pt_regs *);
-static void inia100_intr6(int irq, struct pt_regs *);
-static void inia100_intr7(int irq, struct pt_regs *);
-#endif
 
 static void inia100_panic(char *msg);
 void inia100SCBPost(BYTE * pHcb, BYTE * pScb);
@@ -203,12 +154,7 @@
 {
 	ULONG flags;
 
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(2,1,95)
 	spin_lock_irqsave(&(pHCB->pSRB_lock), flags);
-#else
-	save_flags(flags);
-	cli();
-#endif
 
 	pSRB->next = NULL;	/* Pointer to next */
 	if (pHCB->pSRB_head == NULL)
@@ -216,11 +162,7 @@
 	else
 		pHCB->pSRB_tail->next = pSRB;	/* Pointer to next */
 	pHCB->pSRB_tail = pSRB;
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(2,1,95)
 	spin_unlock_irqrestore(&(pHCB->pSRB_lock), flags);
-#else
-	restore_flags(flags);
-#endif
 	return;
 }
 
@@ -235,22 +177,12 @@
 {
 	Scsi_Cmnd *pSRB;
 	ULONG flags;
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(2,1,95)
 	spin_lock_irqsave(&(pHCB->pSRB_lock), flags);
-#else
-	save_flags(flags);
-	cli();
-#endif
-
 	if ((pSRB = (Scsi_Cmnd *) pHCB->pSRB_head) != NULL) {
 		pHCB->pSRB_head = pHCB->pSRB_head->next;
 		pSRB->next = NULL;
 	}
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(2,1,95)
 	spin_unlock_irqrestore(&(pHCB->pSRB_lock), flags);
-#else
-	restore_flags(flags);
-#endif
 	return (pSRB);
 }
 
@@ -305,28 +237,16 @@
 		unsigned long page_offset, base;
 #endif
 
-#if LINUX_VERSION_CODE > CVT_LINUX_VERSION(2,1,92)
 		struct pci_dev *pdev = NULL;
-#else
-		int index;
-		unsigned char pci_bus, pci_devfn;
-#endif
 
 		bPCIBusNum = 0;
 		bPCIDeviceNum = 0;
 		init_inia100Adapter_table();
 		for (i = 0; i < NUMBER(inia100_pci_devices); i++) {
-#if LINUX_VERSION_CODE > CVT_LINUX_VERSION(2,1,92)
 			pdev = NULL;
 			while ((pdev = pci_find_device(inia100_pci_devices[i].vendor_id,
 					inia100_pci_devices[i].device_id,
 						       pdev)))
-#else
-			index = 0;
-			while (!(pcibios_find_device(inia100_pci_devices[i].vendor_id,
-					inia100_pci_devices[i].device_id,
-					 index++, &pci_bus, &pci_devfn)))
-#endif
 			{
 				if (iAdapters >= MAX_SUPPORTED_ADAPTERS)
 					break;	/* Never greater than maximum   */
@@ -340,7 +260,6 @@
 					/*
 					 * Read sundry information from PCI BIOS.
 					 */
-#if LINUX_VERSION_CODE > CVT_LINUX_VERSION(2,1,92)
 					bPCIBusNum = pdev->bus->number;
 					bPCIDeviceNum = pdev->devfn;
 					dRegValue = pdev->resource[0].start;
@@ -358,26 +277,6 @@
 					pci_write_config_word(pdev, PCI_COMMAND,
 							      command | PCI_COMMAND_MASTER | PCI_COMMAND_IO);
 
-#else
-					bPCIBusNum = pci_bus;
-					bPCIDeviceNum = pci_devfn;
-					pcibios_read_config_dword(pci_bus, pci_devfn, PCI_BASE_ADDRESS_0,
-							     &dRegValue);
-					if (dRegValue == -1) {	/* Check return code            */
-						printk("\n\rinia100: Orchid read configuration error.\n");
-						return (0);	/* Read configuration space error  */
-					}
-					/* <02> read from base address + 0x50 offset to get the wBIOS balue. */
-					wBASE = (WORD) dRegValue;
-
-					/* Now read the interrupt line  */
-					pcibios_read_config_dword(pci_bus, pci_devfn, PCI_INTERRUPT_LINE,
-							     &dRegValue);
-					bInterrupt = dRegValue & 0xFF;	/* Assign interrupt line      */
-					pcibios_read_config_word(pci_bus, pci_devfn, PCI_COMMAND, &command);
-					pcibios_write_config_word(pci_bus, pci_devfn, PCI_COMMAND,
-								  command | PCI_COMMAND_MASTER | PCI_COMMAND_IO);
-#endif
 					wBASE &= PCI_BASE_ADDRESS_IO_MASK;
 					wBIOS = ORC_RDWORD(wBASE, 0x50);
 
@@ -389,11 +288,7 @@
 					 * replace the next line with this one if you are using 2.1.x:
 					 * temp_p->maddr = ioremap(base, page_offset + 256);
 					 */
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(2,1,0)
 					wBASE = ioremap(base, page_offset + 256);
-#else
-					wBASE = (WORD) vremap(base, page_offset + 256);
-#endif
 					if (wBASE) {
 						wBASE += page_offset;
 					}
@@ -426,9 +321,7 @@
 	ULONG dBiosAdr;
 	BYTE *pbBiosAdr;
 
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(1,3,0)
-	tpnt->proc_dir = &proc_scsi_inia100;
-#endif
+	tpnt->proc_name = "INIA100";
 	if (setup_called) {
 		/* Setup by inia100_setup          */
 		printk("inia100: processing commandline: ");
@@ -458,9 +351,7 @@
 
 		pHCB->pSRB_head = NULL;		/* Initial SRB save queue       */
 		pHCB->pSRB_tail = NULL;		/* Initial SRB save queue       */
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(2,1,95)
 		pHCB->pSRB_lock = SPIN_LOCK_UNLOCKED; /* SRB save queue lock */
-#endif
 		/* Get total memory needed for SCB */
 		sz = orc_num_scb * sizeof(ORC_SCB);
 		if ((pHCB->HCS_virScbArray = (PVOID) kmalloc(sz, GFP_ATOMIC | GFP_DMA)) == NULL) {
@@ -485,9 +376,7 @@
 		dBiosAdr = pHCB->HCS_BIOS;
 		dBiosAdr = (dBiosAdr << 4);
 
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(1,3,0)
 		pbBiosAdr = phys_to_virt(dBiosAdr);
-#endif
 
 		if (init_orchid(pHCB)) {	/* Initial orchid chip    */
 			printk("inia100: initial orchid fail!!\n");
@@ -501,10 +390,8 @@
 		hreg->n_io_port = 0xff;
 		hreg->can_queue = orc_num_scb;	/* 03/05/98                   */
 
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(1,3,0)
 		hreg->unique_id = pHCB->HCS_Base;
 		hreg->max_id = pHCB->HCS_MaxTar;
-#endif
 
 		hreg->max_lun = 32;	/* 10/21/97                     */
 /*
@@ -523,7 +410,6 @@
 
 		/* Initial orc chip           */
 		switch (i) {
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(1,3,0)
 		case 0:
 			ok = request_irq(pHCB->HCS_Intr, inia100_intr0, SA_INTERRUPT | SA_SHIRQ, "inia100", NULL);
 			break;
@@ -568,7 +454,6 @@
 			}
 			inia100_panic("inia100: driver needs an IRQ.\n");
 		}
-#endif
 	}
 
 	tpnt->this_id = -1;
@@ -610,21 +495,13 @@
 			pSCB->SCB_SGLen = (U32) (SCpnt->use_sg * 8);
 			pSrbSG = (struct scatterlist *) SCpnt->request_buffer;
 			for (i = 0; i < SCpnt->use_sg; i++, pSG++, pSrbSG++) {
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(1,3,0)
 				pSG->SG_Ptr = (U32) (VIRT_TO_BUS(pSrbSG->address));
-#else
-				pSG->SG_Ptr = (U32) pSrbSG->address;
-#endif
 				pSG->SG_Len = (U32) pSrbSG->length;
 				TotalLen += (U32) pSrbSG->length;
 			}
 		} else {	/* Non SG                       */
 			pSCB->SCB_SGLen = 0x8;
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(1,3,0)
 			pSG->SG_Ptr = (U32) (VIRT_TO_BUS(SCpnt->request_buffer));
-#else
-			pSG->SG_PTR = (U32) SCpnt->request_buffer;
-#endif
 			pSG->SG_Len = (U32) SCpnt->request_bufflen;
 		}
 	}
@@ -814,11 +691,7 @@
  Output         : None.
  Return         : pSRB  -       Pointer to SCSI request block.
 *****************************************************************************/
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(1,3,0)
 int inia100_biosparam(Scsi_Disk * disk, kdev_t dev, int *info_array)
-#else
-int inia100_biosparam(Scsi_Disk * disk, int dev, int *info_array)
-#endif
 {
 	ORC_HCS *pHcb;		/* Point to Host adapter control block */
 	ORC_TCS *pTcb;
@@ -847,96 +720,58 @@
 
 static void subIntr(ORC_HCS * pHCB, int irqno)
 {
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(2,1,95)
 	unsigned long flags;
 
 	spin_lock_irqsave(&io_request_lock, flags);
-#endif
 
 	if (pHCB->HCS_Intr != irqno) {
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(2,1,95)
 		spin_unlock_irqrestore(&io_request_lock, flags);
-#endif
 		return;
 	}
 	orc_interrupt(pHCB);
 
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(2,1,95)
 	spin_unlock_irqrestore(&io_request_lock, flags);
-#endif
 }
 
 /*
  * Interrupts handler (main routine of the driver)
  */
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(1,3,0)
 static void inia100_intr0(int irqno, void *dev_id, struct pt_regs *regs)
-#else
-static void inia100_intr0(int irqno, struct pt_regs *regs)
-#endif
 {
 	subIntr(&orc_hcs[0], irqno);
 }
 
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(1,3,0)
 static void inia100_intr1(int irqno, void *dev_id, struct pt_regs *regs)
-#else
-static void inia100_intr1(int irqno, struct pt_regs *regs)
-#endif
 {
 	subIntr(&orc_hcs[1], irqno);
 }
 
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(1,3,0)
 static void inia100_intr2(int irqno, void *dev_id, struct pt_regs *regs)
-#else
-static void inia100_intr2(int irqno, struct pt_regs *regs)
-#endif
 {
 	subIntr(&orc_hcs[2], irqno);
 }
 
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(1,3,0)
 static void inia100_intr3(int irqno, void *dev_id, struct pt_regs *regs)
-#else
-static void inia100_intr3(int irqno, struct pt_regs *regs)
-#endif
 {
 	subIntr(&orc_hcs[3], irqno);
 }
 
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(1,3,0)
 static void inia100_intr4(int irqno, void *dev_id, struct pt_regs *regs)
-#else
-static void inia100_intr4(int irqno, struct pt_regs *regs)
-#endif
 {
 	subIntr(&orc_hcs[4], irqno);
 }
 
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(1,3,0)
 static void inia100_intr5(int irqno, void *dev_id, struct pt_regs *regs)
-#else
-static void inia100_intr5(int irqno, struct pt_regs *regs)
-#endif
 {
 	subIntr(&orc_hcs[5], irqno);
 }
 
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(1,3,0)
 static void inia100_intr6(int irqno, void *dev_id, struct pt_regs *regs)
-#else
-static void inia100_intr6(int irqno, struct pt_regs *regs)
-#endif
 {
 	subIntr(&orc_hcs[6], irqno);
 }
 
-#if LINUX_VERSION_CODE >= CVT_LINUX_VERSION(1,3,0)
 static void inia100_intr7(int irqno, void *dev_id, struct pt_regs *regs)
-#else
-static void inia100_intr7(int irqno, struct pt_regs *regs)
-#endif
 {
 	subIntr(&orc_hcs[7], irqno);
 }