Messages in this thread Patch in this message |  | | From | Keith Owens <> | Subject | 2.1.16, patch for scsi warning messages | Date | Sun, 22 Dec 1996 19:36:49 +1100 |
| |
Trying to compile a kernel with every legal option turned on. Warning messages in various SCSI modules, initialization from incompatible pointer type.
diff -ur linux-2.1.16.orig/drivers/scsi/AM53C974.c linux/drivers/scsi/AM53C974.c --- linux-2.1.16.orig/drivers/scsi/AM53C974.c Tue Oct 1 17:34:00 1996 +++ linux/drivers/scsi/AM53C974.c Sun Dec 22 18:41:18 1996 @@ -2205,7 +2205,7 @@ * * Returns : status (SCSI_ABORT_SUCCESS) **************************************************************************/ -int AM53C974_reset(Scsi_Cmnd *cmd) +int AM53C974_reset(Scsi_Cmnd *cmd, unsigned int reset_flags /*not used*/) { AM53C974_local_declare(); int i; diff -ur linux-2.1.16.orig/drivers/scsi/AM53C974.h linux/drivers/scsi/AM53C974.h --- linux-2.1.16.orig/drivers/scsi/AM53C974.h Sun Dec 22 16:06:03 1996 +++ linux/drivers/scsi/AM53C974.h Sun Dec 22 18:41:25 1996 @@ -299,7 +299,7 @@ int AM53C974_command(Scsi_Cmnd *SCpnt); int AM53C974_queue_command(Scsi_Cmnd *cmd, void (*done)(Scsi_Cmnd *)); int AM53C974_abort(Scsi_Cmnd *cmd); -int AM53C974_reset (Scsi_Cmnd *cmd); +int AM53C974_reset (Scsi_Cmnd *cmd, unsigned int); #define AM53C974_local_declare() unsigned long io_port #define AM53C974_setio(instance) io_port = instance->io_port diff -ur linux-2.1.16.orig/drivers/scsi/NCR53c406a.c linux/drivers/scsi/NCR53c406a.c --- linux-2.1.16.orig/drivers/scsi/NCR53c406a.c Fri Apr 12 16:49:40 1996 +++ linux/drivers/scsi/NCR53c406a.c Sun Dec 22 18:53:31 1996 @@ -729,7 +729,7 @@ } int -NCR53c406a_reset(Scsi_Cmnd *SCpnt){ +NCR53c406a_reset(Scsi_Cmnd *SCpnt, unsigned int reset_flags /*not used*/){ DEB(printk("NCR53c406a_reset called\n")); outb(C4_IMG, CONFIG4); /* Select reg set 0 */ outb(CHIP_RESET, CMD_REG); diff -ur linux-2.1.16.orig/drivers/scsi/NCR53c406a.h linux/drivers/scsi/NCR53c406a.h --- linux-2.1.16.orig/drivers/scsi/NCR53c406a.h Wed Feb 14 18:26:25 1996 +++ linux/drivers/scsi/NCR53c406a.h Sun Dec 22 18:53:43 1996 @@ -57,7 +57,7 @@ int NCR53c406a_command(Scsi_Cmnd *); int NCR53c406a_queue(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); int NCR53c406a_abort(Scsi_Cmnd *); -int NCR53c406a_reset(Scsi_Cmnd *); +int NCR53c406a_reset(Scsi_Cmnd *, unsigned int); int NCR53c406a_biosparm(Disk *, kdev_t, int []); #endif /* _NCR53C406A_H */ diff -ur linux-2.1.16.orig/drivers/scsi/aha1740.c linux/drivers/scsi/aha1740.c --- linux-2.1.16.orig/drivers/scsi/aha1740.c Wed Oct 30 10:20:26 1996 +++ linux/drivers/scsi/aha1740.c Sun Dec 22 18:38:46 1996 @@ -499,7 +499,7 @@ that it will get some kind of response for the command in SCpnt. We must oblige, or the command will hang the scsi system */ -int aha1740_reset(Scsi_Cmnd * SCpnt) +int aha1740_reset(Scsi_Cmnd * SCpnt, unsigned int reset_flags /*not used*/) { DEB(printk("aha1740_reset called\n")); return SCSI_RESET_PUNT; diff -ur linux-2.1.16.orig/drivers/scsi/aha1740.h linux/drivers/scsi/aha1740.h --- linux-2.1.16.orig/drivers/scsi/aha1740.h Sun Dec 22 16:06:02 1996 +++ linux/drivers/scsi/aha1740.h Sun Dec 22 18:38:55 1996 @@ -157,7 +157,7 @@ int aha1740_command(Scsi_Cmnd *); int aha1740_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); int aha1740_abort(Scsi_Cmnd *); -int aha1740_reset(Scsi_Cmnd *); +int aha1740_reset(Scsi_Cmnd *, unsigned int); int aha1740_biosparam(Disk *, kdev_t, int*); #define AHA1740_ECBS 32 diff -ur linux-2.1.16.orig/drivers/scsi/fdomain.c linux/drivers/scsi/fdomain.c --- linux-2.1.16.orig/drivers/scsi/fdomain.c Sun Nov 3 01:40:27 1996 +++ linux/drivers/scsi/fdomain.c Sun Dec 22 19:07:46 1996 @@ -1007,7 +1007,7 @@ Write_FIFO_port = port_base + Write_FIFO; Write_SCSI_Data_port = port_base + Write_SCSI_Data; - fdomain_16x0_reset( NULL ); + fdomain_16x0_reset( NULL, 0 ); if (fdomain_test_loopback()) { #if DEBUG_DETECT @@ -1892,7 +1892,7 @@ return SCSI_ABORT_SUCCESS; } -int fdomain_16x0_reset( Scsi_Cmnd *SCpnt ) +int fdomain_16x0_reset( Scsi_Cmnd *SCpnt, unsigned int reset_flags /*not used*/ ) { #if DEBUG_RESET static int called_once = 0; diff -ur linux-2.1.16.orig/drivers/scsi/fdomain.h linux/drivers/scsi/fdomain.h --- linux-2.1.16.orig/drivers/scsi/fdomain.h Fri Oct 13 15:38:18 1995 +++ linux/drivers/scsi/fdomain.h Sun Dec 22 18:42:29 1996 @@ -29,7 +29,7 @@ int fdomain_16x0_command( Scsi_Cmnd * ); int fdomain_16x0_abort( Scsi_Cmnd * ); const char *fdomain_16x0_info( struct Scsi_Host * ); -int fdomain_16x0_reset( Scsi_Cmnd * ); +int fdomain_16x0_reset( Scsi_Cmnd *, unsigned int ); int fdomain_16x0_queue( Scsi_Cmnd *, void (*done)(Scsi_Cmnd *) ); int fdomain_16x0_biosparam( Disk *, kdev_t, int * ); int fdomain_16x0_proc_info( char *buffer, char **start, off_t offset, diff -ur linux-2.1.16.orig/drivers/scsi/ibmmca.c linux/drivers/scsi/ibmmca.c --- linux-2.1.16.orig/drivers/scsi/ibmmca.c Wed Dec 18 20:48:52 1996 +++ linux/drivers/scsi/ibmmca.c Sun Dec 22 18:52:08 1996 @@ -843,7 +843,7 @@ ibmmca_abort (Scsi_Cmnd * cmd) { /*do a reset instead, since abort does not work well for me at present */ - return ibmmca_reset (cmd); + return ibmmca_reset (cmd, 0); #if 0 unsigned int ldn; @@ -889,7 +889,7 @@ /*--------------------------------------------------------------------*/ int -ibmmca_reset (Scsi_Cmnd * cmd) +ibmmca_reset (Scsi_Cmnd * cmd, unsigned int reset_flags /*not used*/) { /*issue reset immediate command to subsystem, and wait for interrupt */ printk ("IBM MCA SCSI: resetting all devices.\n"); diff -ur linux-2.1.16.orig/drivers/scsi/ibmmca.h linux/drivers/scsi/ibmmca.h --- linux-2.1.16.orig/drivers/scsi/ibmmca.h Fri Dec 13 01:54:19 1996 +++ linux/drivers/scsi/ibmmca.h Sun Dec 22 18:34:55 1996 @@ -11,7 +11,7 @@ int ibmmca_command (Scsi_Cmnd *); int ibmmca_queuecommand (Scsi_Cmnd *, void (*done) (Scsi_Cmnd *)); int ibmmca_abort (Scsi_Cmnd *); -int ibmmca_reset (Scsi_Cmnd *); +int ibmmca_reset (Scsi_Cmnd *, unsigned int); int ibmmca_biosparam (Disk *, kdev_t, int *); /*structure for /proc filesystem */ diff -ur linux-2.1.16.orig/drivers/scsi/ppa.c linux/drivers/scsi/ppa.c --- linux-2.1.16.orig/drivers/scsi/ppa.c Mon Nov 18 20:31:32 1996 +++ linux/drivers/scsi/ppa.c Sun Dec 22 18:36:20 1996 @@ -463,7 +463,7 @@ return SCSI_ABORT_SNOOZE; } -int ppa_reset( Scsi_Cmnd * cmd ) +int ppa_reset( Scsi_Cmnd * cmd, unsigned int reset_flags /*not used*/ ) { ppa_abort_flag = 2; return SCSI_RESET_PUNT; diff -ur linux-2.1.16.orig/drivers/scsi/ppa.h linux/drivers/scsi/ppa.h --- linux-2.1.16.orig/drivers/scsi/ppa.h Thu Mar 14 21:57:46 1996 +++ linux/drivers/scsi/ppa.h Sun Dec 22 18:36:30 1996 @@ -14,7 +14,7 @@ int ppa_command(Scsi_Cmnd *); int ppa_queuecommand(Scsi_Cmnd *, void (* done)(Scsi_Cmnd *)); int ppa_abort(Scsi_Cmnd *); -int ppa_reset(Scsi_Cmnd *); +int ppa_reset(Scsi_Cmnd *, unsigned int); int ppa_biosparam(Disk *, kdev_t, int[]); #define PPA { \ diff -ur linux-2.1.16.orig/drivers/scsi/qlogicfas.c linux/drivers/scsi/qlogicfas.c --- linux-2.1.16.orig/drivers/scsi/qlogicfas.c Thu Jul 11 14:41:25 1996 +++ linux/drivers/scsi/qlogicfas.c Sun Dec 22 18:37:41 1996 @@ -656,7 +656,7 @@ /*----------------------------------------------------------------*/ /* reset SCSI bus */ -int qlogicfas_reset(Scsi_Cmnd * cmd) +int qlogicfas_reset(Scsi_Cmnd * cmd, unsigned int reset_flags /*not used*/) { qabort = 2; ql_zap(); diff -ur linux-2.1.16.orig/drivers/scsi/qlogicfas.h linux/drivers/scsi/qlogicfas.h --- linux-2.1.16.orig/drivers/scsi/qlogicfas.h Thu Jul 11 14:41:25 1996 +++ linux/drivers/scsi/qlogicfas.h Sun Dec 22 18:37:53 1996 @@ -6,7 +6,7 @@ int qlogicfas_command(Scsi_Cmnd *); int qlogicfas_queuecommand(Scsi_Cmnd *, void (* done)(Scsi_Cmnd *)); int qlogicfas_abort(Scsi_Cmnd *); -int qlogicfas_reset(Scsi_Cmnd *); +int qlogicfas_reset(Scsi_Cmnd *, unsigned int); int qlogicfas_biosparam(Disk *, kdev_t, int[]); #ifndef NULL diff -ur linux-2.1.16.orig/drivers/scsi/wd7000.c linux/drivers/scsi/wd7000.c --- linux-2.1.16.orig/drivers/scsi/wd7000.c Mon Sep 16 20:05:18 1996 +++ linux/drivers/scsi/wd7000.c Sun Dec 22 18:50:35 1996 @@ -1462,7 +1462,7 @@ /* * I also have no idea how to do a reset... */ -int wd7000_reset(Scsi_Cmnd * SCpnt) +int wd7000_reset(Scsi_Cmnd * SCpnt, unsigned int reset_flags /*not used*/) { return SCSI_RESET_PUNT; } diff -ur linux-2.1.16.orig/drivers/scsi/wd7000.h linux/drivers/scsi/wd7000.h --- linux-2.1.16.orig/drivers/scsi/wd7000.h Sun Dec 22 16:06:03 1996 +++ linux/drivers/scsi/wd7000.h Sun Dec 22 18:51:05 1996 @@ -17,7 +17,7 @@ int wd7000_command(Scsi_Cmnd *); int wd7000_queuecommand(Scsi_Cmnd *, void (*done)(Scsi_Cmnd *)); int wd7000_abort(Scsi_Cmnd *); -int wd7000_reset(Scsi_Cmnd *); +int wd7000_reset(Scsi_Cmnd *, unsigned int); int wd7000_biosparam(Disk *, kdev_t, int *); #ifndef NULL
|  |