patch-1.3.28 linux/drivers/scsi/aha1542.c

• Lines: 68
• Date: Mon Sep 18 08:54:08 1995
• Orig file: v1.3.27/linux/drivers/scsi/aha1542.c
• Orig date: Wed Sep 13 12:45:30 1995

diff -u --recursive --new-file v1.3.27/linux/drivers/scsi/aha1542.c linux/drivers/scsi/aha1542.c
@@ -9,7 +9,8 @@
  *        Set up on-board DMA controller, such that we do not have to
  *        have the bios enabled to use the aha1542.
  *  Modified by David Gentzel
- *	  Don't call request_dma if dma mask is 0 (for BusLogic BT-445S VL-Bus controller).
+ *	  Don't call request_dma if dma mask is 0 (for BusLogic BT-445S VL-Bus
+ *        controller).
  *  Modified by Matti Aarnio
  *        Accept parameters from LILO cmd-line. -- 1-Oct-94
  */
@@ -37,6 +38,13 @@
 
 #include "aha1542.h"
 
+#include<linux/stat.h>
+
+struct proc_dir_entry proc_scsi_aha1542 = {
+    PROC_SCSI_AHA1542, 7, "aha1542",
+    S_IFDIR | S_IRUGO | S_IXUGO, 2
+};
+
 #ifdef DEBUG
 #define DEB(x) x
 #else
@@ -928,6 +936,8 @@
 
     DEB(printk("aha1542_detect: \n"));
 
+    tpnt->proc_dir = &proc_scsi_aha1542;
+
     for(indx = 0; indx < sizeof(bases)/sizeof(bases[0]); indx++)
 	    if(bases[indx] != 0 && !check_region(bases[indx], 4)) { 
 		    shpnt = scsi_register(tpnt,
@@ -1065,6 +1075,7 @@
 		    continue;
 		    
 	    };
+	
     return count;
 }
 
@@ -1137,13 +1148,15 @@
    if(HOSTDATA(SCpnt->host)->SCint[i])
      {
        if(HOSTDATA(SCpnt->host)->SCint[i] == SCpnt) {
-	 printk("Timed out command pending for %4.4x\n", SCpnt->request.dev);
+	 printk("Timed out command pending for %s\n",
+		kdevname(SCpnt->request.rq_dev));
 	 if (HOSTDATA(SCpnt->host)->mb[i].status) {
 	   printk("OGMB still full - restarting\n");
 	   aha1542_out(SCpnt->host->io_port, &ahacmd, 1);
 	 };
        } else
-	 printk("Other pending command %4.4x\n", SCpnt->request.dev);
+	 printk("Other pending command %s\n",
+		kdevname(SCpnt->request.rq_dev));
      }
 
 #endif
@@ -1259,7 +1272,7 @@
 
 #include "sd.h"
 
-int aha1542_biosparam(Scsi_Disk * disk, int dev, int * ip)
+int aha1542_biosparam(Scsi_Disk * disk, kdev_t dev, int * ip)
 {
   int translation_algorithm;
   int size = disk->capacity;