GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-20 21:51:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ncr5380: Remove redundant AUTOSENSE macro

Browse source 
Every NCR5380 driver sets AUTOSENSE so it need not be optional (and the
mid-layer expects it). Remove this redundant macro to improve readability.

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Tested-by: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Finn Thain 2014-11-12 16:11:54 +11:00 • committed by Christoph Hellwig
parent 76f13b9321
commit 997acab7d5
14 changed files with 3 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

14
drivers/scsi/NCR5380.c
View file

@ -627,9 +627,6 @@ NCR5380_print_options(struct Scsi_Host *instance)
#ifdef AUTOPROBE_IRQ #ifdef AUTOPROBE_IRQ
" AUTOPROBE_IRQ" " AUTOPROBE_IRQ"
#endif #endif
#ifdef AUTOSENSE
" AUTOSENSE"
#endif
#ifdef DIFFERENTIAL #ifdef DIFFERENTIAL
" DIFFERENTIAL" " DIFFERENTIAL"
#endif #endif
@ -857,12 +854,6 @@ static int NCR5380_init(struct Scsi_Host *instance, int flags)
hostdata->host = instance; hostdata->host = instance;
hostdata->time_expires = 0; hostdata->time_expires = 0;
#ifndef AUTOSENSE
if ((instance->cmd_per_lun > 1) || instance->can_queue > 1)
printk(KERN_WARNING "scsi%d : WARNING : support for multiple outstanding commands enabled\n" " without AUTOSENSE option, contingent allegiance conditions may\n"
" be incorrectly cleared.\n", instance->host_no);
#endif /* def AUTOSENSE */
NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE); NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
NCR5380_write(MODE_REG, MR_BASE); NCR5380_write(MODE_REG, MR_BASE);
NCR5380_write(TARGET_COMMAND_REG, 0); NCR5380_write(TARGET_COMMAND_REG, 0);
@ -2260,7 +2251,6 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) {
else if (status_byte(cmd->SCp.Status) != GOOD) else if (status_byte(cmd->SCp.Status) != GOOD)
cmd->result = (cmd->result & 0x00ffff) | (DID_ERROR << 16); cmd->result = (cmd->result & 0x00ffff) | (DID_ERROR << 16);
#ifdef AUTOSENSE
if ((cmd->cmnd[0] == REQUEST_SENSE) && if ((cmd->cmnd[0] == REQUEST_SENSE) &&
hostdata->ses.cmd_len) { hostdata->ses.cmd_len) {
scsi_eh_restore_cmnd(cmd, &hostdata->ses); scsi_eh_restore_cmnd(cmd, &hostdata->ses);
@ -2277,9 +2267,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) {
hostdata->issue_queue; hostdata->issue_queue;
hostdata->issue_queue = (Scsi_Cmnd *) cmd; hostdata->issue_queue = (Scsi_Cmnd *) cmd;
dprintk(NDEBUG_QUEUES, "scsi%d : REQUEST SENSE added to head of issue queue\n", instance->host_no); dprintk(NDEBUG_QUEUES, "scsi%d : REQUEST SENSE added to head of issue queue\n", instance->host_no);
} else } else {
#endif /* def AUTOSENSE */
{
collect_stats(hostdata, cmd); collect_stats(hostdata, cmd);
cmd->scsi_done(cmd); cmd->scsi_done(cmd);
} }

5
drivers/scsi/NCR5380.h
View file

@ -25,10 +25,7 @@
#define NCR5380_H #define NCR5380_H
#include <linux/interrupt.h> #include <linux/interrupt.h>
#ifdef AUTOSENSE
#include <scsi/scsi_eh.h> #include <scsi/scsi_eh.h>
#endif
#define NCR5380_PUBLIC_RELEASE 7 #define NCR5380_PUBLIC_RELEASE 7
#define NCR53C400_PUBLIC_RELEASE 2 #define NCR53C400_PUBLIC_RELEASE 2
@ -281,9 +278,7 @@ struct NCR5380_hostdata {
unsigned pendingr; unsigned pendingr;
unsigned pendingw; unsigned pendingw;
#endif #endif
#ifdef AUTOSENSE
struct scsi_eh_save ses; struct scsi_eh_save ses;
#endif
}; };
#ifdef __KERNEL__ #ifdef __KERNEL__

1
drivers/scsi/arm/cumana_1.c
View file

@ -18,7 +18,6 @@
#include <scsi/scsicam.h> #include <scsi/scsicam.h>
#define AUTOSENSE
#define PSEUDO_DMA #define PSEUDO_DMA
#define CUMANASCSI_PUBLIC_RELEASE 1 #define CUMANASCSI_PUBLIC_RELEASE 1

1
drivers/scsi/arm/oak.c
View file

@ -17,7 +17,6 @@
#include "../scsi.h" #include "../scsi.h"
#include <scsi/scsi_host.h> #include <scsi/scsi_host.h>
#define AUTOSENSE
/*#define PSEUDO_DMA*/ /*#define PSEUDO_DMA*/
#define OAKSCSI_PUBLIC_RELEASE 1 #define OAKSCSI_PUBLIC_RELEASE 1

15
drivers/scsi/atari_NCR5380.c
View file

@ -683,9 +683,6 @@ static inline void NCR5380_all_init(void)
static void __init NCR5380_print_options(struct Scsi_Host *instance) static void __init NCR5380_print_options(struct Scsi_Host *instance)
{ {
printk(" generic options" printk(" generic options"
#ifdef AUTOSENSE
" AUTOSENSE"
#endif
#ifdef REAL_DMA #ifdef REAL_DMA
" REAL DMA" " REAL DMA"
#endif #endif
@ -842,13 +839,6 @@ static int __init NCR5380_init(struct Scsi_Host *instance, int flags)
first_instance = instance; first_instance = instance;
} }
#ifndef AUTOSENSE
if ((instance->cmd_per_lun > 1) || (instance->can_queue > 1))
printk("scsi%d: WARNING : support for multiple outstanding commands enabled\n"
" without AUTOSENSE option, contingent allegiance conditions may\n"
" be incorrectly cleared.\n", HOSTNO);
#endif /* def AUTOSENSE */
NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE); NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
NCR5380_write(MODE_REG, MR_BASE); NCR5380_write(MODE_REG, MR_BASE);
NCR5380_write(TARGET_COMMAND_REG, 0); NCR5380_write(TARGET_COMMAND_REG, 0);
@ -2199,7 +2189,6 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
else if (status_byte(cmd->SCp.Status) != GOOD) else if (status_byte(cmd->SCp.Status) != GOOD)
cmd->result = (cmd->result & 0x00ffff) | (DID_ERROR << 16); cmd->result = (cmd->result & 0x00ffff) | (DID_ERROR << 16);
#ifdef AUTOSENSE
if ((cmd->cmnd[0] == REQUEST_SENSE) && if ((cmd->cmnd[0] == REQUEST_SENSE) &&
hostdata->ses.cmd_len) { hostdata->ses.cmd_len) {
scsi_eh_restore_cmnd(cmd, &hostdata->ses); scsi_eh_restore_cmnd(cmd, &hostdata->ses);
@ -2219,9 +2208,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
local_irq_restore(flags); local_irq_restore(flags);
dprintk(NDEBUG_QUEUES, "scsi%d: REQUEST SENSE added to head of " dprintk(NDEBUG_QUEUES, "scsi%d: REQUEST SENSE added to head of "
"issue queue\n", H_NO(cmd)); "issue queue\n", H_NO(cmd));
} else } else {
#endif /* def AUTOSENSE */
{
#ifdef NCR5380_STATS #ifdef NCR5380_STATS
collect_stats(hostdata, cmd); collect_stats(hostdata, cmd);
#endif #endif

1
drivers/scsi/atari_scsi.c
View file

@ -67,7 +67,6 @@
#include <linux/module.h> #include <linux/module.h>
#define AUTOSENSE
/* For the Atari version, use only polled IO or REAL_DMA */ /* For the Atari version, use only polled IO or REAL_DMA */
#define REAL_DMA #define REAL_DMA
/* Support tagged queuing? (on devices that are able to... :-) */ /* Support tagged queuing? (on devices that are able to... :-) */

1
drivers/scsi/dmx3191d.c
View file

@ -33,7 +33,6 @@
/* /*
* Definitions for the generic 5380 driver. * Definitions for the generic 5380 driver.
*/ */
#define AUTOSENSE
#define NCR5380_read(reg) inb(port + reg) #define NCR5380_read(reg) inb(port + reg)
#define NCR5380_write(reg, value) outb(value, port + reg) #define NCR5380_write(reg, value) outb(value, port + reg)

4
drivers/scsi/dtc.c
View file

@ -1,5 +1,4 @@
#define AUTOSENSE
#define PSEUDO_DMA #define PSEUDO_DMA
#define DONT_USE_INTR #define DONT_USE_INTR
#define UNSAFE /* Leave interrupts enabled during pseudo-dma I/O */ #define UNSAFE /* Leave interrupts enabled during pseudo-dma I/O */
@ -30,9 +29,6 @@
/* /*
* Options : * Options :
* AUTOSENSE - if defined, REQUEST SENSE will be performed automatically
* for commands that return with a CHECK CONDITION status.
*
* PSEUDO_DMA - enables PSEUDO-DMA hardware, should give a 3-4X performance * PSEUDO_DMA - enables PSEUDO-DMA hardware, should give a 3-4X performance
* increase compared to polled I/O. * increase compared to polled I/O.
* *

2
drivers/scsi/g_NCR5380.c
View file

@ -80,8 +80,6 @@
#define USLEEP_WAITLONG 500 #define USLEEP_WAITLONG 500
#define AUTOPROBE_IRQ #define AUTOPROBE_IRQ
#define AUTOSENSE
#ifdef CONFIG_SCSI_GENERIC_NCR53C400 #ifdef CONFIG_SCSI_GENERIC_NCR53C400
#define NCR53C400_PSEUDO_DMA 1 #define NCR53C400_PSEUDO_DMA 1

2
drivers/scsi/mac_scsi.c
View file

@ -48,8 +48,6 @@
#include <scsi/scsi_host.h> #include <scsi/scsi_host.h>
#include "mac_scsi.h" #include "mac_scsi.h"
/* These control the behaviour of the generic 5380 core */
#define AUTOSENSE
#define PSEUDO_DMA #define PSEUDO_DMA
#include "NCR5380.h" #include "NCR5380.h"

4
drivers/scsi/pas16.c
View file

@ -1,4 +1,3 @@
#define AUTOSENSE
#define PSEUDO_DMA #define PSEUDO_DMA
#define UNSAFE /* Not unsafe for PAS16 -- use it */ #define UNSAFE /* Not unsafe for PAS16 -- use it */
#define PDEBUG 0 #define PDEBUG 0
@ -39,9 +38,6 @@
/* /*
* Options : * Options :
* AUTOSENSE - if defined, REQUEST SENSE will be performed automatically
* for commands that return with a CHECK CONDITION status.
*
* LIMIT_TRANSFERSIZE - if defined, limit the pseudo-dma transfers to 512 * LIMIT_TRANSFERSIZE - if defined, limit the pseudo-dma transfers to 512
* bytes at a time. Since interrupts are disabled by default during * bytes at a time. Since interrupts are disabled by default during
* these transfers, we might need this to give reasonable interrupt * these transfers, we might need this to give reasonable interrupt

16
drivers/scsi/sun3_NCR5380.c
View file

@ -629,9 +629,6 @@ static inline void NCR5380_all_init (void)
static void __init NCR5380_print_options (struct Scsi_Host *instance) static void __init NCR5380_print_options (struct Scsi_Host *instance)
{ {
printk(" generic options" printk(" generic options"
#ifdef AUTOSENSE
" AUTOSENSE"
#endif
#ifdef REAL_DMA #ifdef REAL_DMA
" REAL DMA" " REAL DMA"
#endif #endif
@ -788,14 +785,6 @@ static int __init NCR5380_init(struct Scsi_Host *instance, int flags)
first_instance = instance; first_instance = instance;
} }
#ifndef AUTOSENSE
if ((instance->cmd_per_lun > 1) || (instance->can_queue > 1))
printk("scsi%d: WARNING : support for multiple outstanding commands enabled\n"
" without AUTOSENSE option, contingent allegiance conditions may\n"
" be incorrectly cleared.\n", HOSTNO);
#endif /* def AUTOSENSE */
NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE); NCR5380_write(INITIATOR_COMMAND_REG, ICR_BASE);
NCR5380_write(MODE_REG, MR_BASE); NCR5380_write(MODE_REG, MR_BASE);
NCR5380_write(TARGET_COMMAND_REG, 0); NCR5380_write(TARGET_COMMAND_REG, 0);
@ -2161,7 +2150,6 @@ static void NCR5380_information_transfer (struct Scsi_Host *instance)
else if (status_byte(cmd->SCp.Status) != GOOD) else if (status_byte(cmd->SCp.Status) != GOOD)
cmd->result = (cmd->result & 0x00ffff) | (DID_ERROR << 16); cmd->result = (cmd->result & 0x00ffff) | (DID_ERROR << 16);
#ifdef AUTOSENSE
if ((cmd->cmnd[0] == REQUEST_SENSE) && if ((cmd->cmnd[0] == REQUEST_SENSE) &&
hostdata->ses.cmd_len) { hostdata->ses.cmd_len) {
scsi_eh_restore_cmnd(cmd, &hostdata->ses); scsi_eh_restore_cmnd(cmd, &hostdata->ses);
@ -2185,9 +2173,7 @@ static void NCR5380_information_transfer (struct Scsi_Host *instance)
local_irq_restore(flags); local_irq_restore(flags);
dprintk(NDEBUG_QUEUES, "scsi%d: REQUEST SENSE added to head of " dprintk(NDEBUG_QUEUES, "scsi%d: REQUEST SENSE added to head of "
"issue queue\n", H_NO(cmd)); "issue queue\n", H_NO(cmd));
} else } else {
#endif /* def AUTOSENSE */
{
#ifdef NCR5380_STATS #ifdef NCR5380_STATS
collect_stats(hostdata, cmd); collect_stats(hostdata, cmd);
#endif #endif

2
drivers/scsi/sun3_scsi.c
View file

@ -45,8 +45,6 @@
* PARITY - enable parity checking. Not supported. * PARITY - enable parity checking. Not supported.
*/ */
#define AUTOSENSE
#include <linux/types.h> #include <linux/types.h>
#include <linux/stddef.h> #include <linux/stddef.h>
#include <linux/ctype.h> #include <linux/ctype.h>

4
drivers/scsi/t128.c
View file

@ -1,4 +1,3 @@
#define AUTOSENSE
#define PSEUDO_DMA #define PSEUDO_DMA
/* /*
@ -40,9 +39,6 @@
/* /*
* Options : * Options :
* AUTOSENSE - if defined, REQUEST SENSE will be performed automatically
* for commands that return with a CHECK CONDITION status.
*
* PSEUDO_DMA - enables PSEUDO-DMA hardware, should give a 3-4X performance * PSEUDO_DMA - enables PSEUDO-DMA hardware, should give a 3-4X performance
* increase compared to polled I/O. * increase compared to polled I/O.
* *