git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
scsi
/
atari_scsi.c
diff --git
a/drivers/scsi/atari_scsi.c
b/drivers/scsi/atari_scsi.c
index
c3d8bc8
..
dfb1bcf
100644
(file)
--- a/
drivers/scsi/atari_scsi.c
+++ b/
drivers/scsi/atari_scsi.c
@@
-65,7
+65,6
@@
-#include <linux/config.h>
#include <linux/module.h>
#define NDEBUG (0)
#include <linux/module.h>
#define NDEBUG (0)
@@
-91,6
+90,7
@@
#include <linux/interrupt.h>
#include <linux/init.h>
#include <linux/nvram.h>
#include <linux/interrupt.h>
#include <linux/init.h>
#include <linux/nvram.h>
+#include <linux/bitops.h>
#include <asm/setup.h>
#include <asm/atarihw.h>
#include <asm/setup.h>
#include <asm/atarihw.h>
@@
-99,7
+99,6
@@
#include <asm/pgtable.h>
#include <asm/irq.h>
#include <asm/traps.h>
#include <asm/pgtable.h>
#include <asm/irq.h>
#include <asm/traps.h>
-#include <asm/bitops.h>
#include "scsi.h"
#include <scsi/scsi_host.h>
#include "scsi.h"
#include <scsi/scsi_host.h>
@@
-195,8
+194,8
@@
static int falcon_classify_cmd( Scsi_Cmnd *cmd );
static unsigned long atari_dma_xfer_len( unsigned long wanted_len,
Scsi_Cmnd *cmd, int write_flag );
#endif
static unsigned long atari_dma_xfer_len( unsigned long wanted_len,
Scsi_Cmnd *cmd, int write_flag );
#endif
-static irqreturn_t scsi_tt_intr( int irq, void *dummy
, struct pt_regs *fp
);
-static irqreturn_t scsi_falcon_intr( int irq, void *dummy
, struct pt_regs *fp
);
+static irqreturn_t scsi_tt_intr( int irq, void *dummy);
+static irqreturn_t scsi_falcon_intr( int irq, void *dummy);
static void falcon_release_lock_if_possible( struct NCR5380_hostdata *
hostdata );
static void falcon_get_lock( void );
static void falcon_release_lock_if_possible( struct NCR5380_hostdata *
hostdata );
static void falcon_get_lock( void );
@@
-239,17
+238,17
@@
static int atari_read_overruns = 0;
#endif
static int setup_can_queue = -1;
#endif
static int setup_can_queue = -1;
-
MODULE_PARM(setup_can_queue, "i"
);
+
module_param(setup_can_queue, int, 0
);
static int setup_cmd_per_lun = -1;
static int setup_cmd_per_lun = -1;
-
MODULE_PARM(setup_cmd_per_lun, "i"
);
+
module_param(setup_cmd_per_lun, int, 0
);
static int setup_sg_tablesize = -1;
static int setup_sg_tablesize = -1;
-
MODULE_PARM(setup_sg_tablesize, "i"
);
+
module_param(setup_sg_tablesize, int, 0
);
#ifdef SUPPORT_TAGS
static int setup_use_tagged_queuing = -1;
#ifdef SUPPORT_TAGS
static int setup_use_tagged_queuing = -1;
-
MODULE_PARM(setup_use_tagged_queuing, "i"
);
+
module_param(setup_use_tagged_queuing, int, 0
);
#endif
static int setup_hostid = -1;
#endif
static int setup_hostid = -1;
-
MODULE_PARM(setup_hostid, "i"
);
+
module_param(setup_hostid, int, 0
);
#if defined(CONFIG_TT_DMA_EMUL)
#if defined(CONFIG_TT_DMA_EMUL)
@@
-286,7
+285,7
@@
static int scsi_dma_is_ignored_buserr( unsigned char dma_stat )
* end-of-DMA, both SCSI ints are triggered simultaneously, so the NCR int has
* to clear the DMA int pending bit before it allows other level 6 interrupts.
*/
* end-of-DMA, both SCSI ints are triggered simultaneously, so the NCR int has
* to clear the DMA int pending bit before it allows other level 6 interrupts.
*/
-static void scsi_dma_buserr (int irq, void *dummy
, struct pt_regs *fp
)
+static void scsi_dma_buserr (int irq, void *dummy)
{
unsigned char dma_stat = tt_scsi_dma.dma_ctrl;
{
unsigned char dma_stat = tt_scsi_dma.dma_ctrl;
@@
-315,7
+314,7
@@
static void scsi_dma_buserr (int irq, void *dummy, struct pt_regs *fp)
#endif
#endif
-static irqreturn_t scsi_tt_intr (int irq, void *dummy
, struct pt_regs *fp
)
+static irqreturn_t scsi_tt_intr (int irq, void *dummy)
{
#ifdef REAL_DMA
int dma_stat;
{
#ifdef REAL_DMA
int dma_stat;
@@
-407,7
+406,7
@@
static irqreturn_t scsi_tt_intr (int irq, void *dummy, struct pt_regs *fp)
}
}
-static irqreturn_t scsi_falcon_intr (int irq, void *dummy
, struct pt_regs *fp
)
+static irqreturn_t scsi_falcon_intr (int irq, void *dummy)
{
#ifdef REAL_DMA
int dma_stat;
{
#ifdef REAL_DMA
int dma_stat;
@@
-600,7
+599,7
@@
int atari_queue_command (Scsi_Cmnd *cmd, void (*done)(Scsi_Cmnd *))
#endif
#endif
-int atari_scsi_detect (
Scsi_Host_T
emplate *host)
+int atari_scsi_detect (
struct scsi_host_t
emplate *host)
{
static int called = 0;
struct Scsi_Host *instance;
{
static int called = 0;
struct Scsi_Host *instance;
@@
-1141,7
+1140,7
@@
static void atari_scsi_falcon_reg_write( unsigned char reg, unsigned char value
#include "atari_NCR5380.c"
#include "atari_NCR5380.c"
-static
Scsi_Host_T
emplate driver_template = {
+static
struct scsi_host_t
emplate driver_template = {
.proc_info = atari_scsi_proc_info,
.name = "Atari native SCSI",
.detect = atari_scsi_detect,
.proc_info = atari_scsi_proc_info,
.name = "Atari native SCSI",
.detect = atari_scsi_detect,