linux-toradex.git/drivers/scsi/pas16.c, branch v4.4.99

ncr5380: Drop legacy scsi.h include

2014-11-20T08:11:10+00:00

Convert Scsi_Cmnd to struct scsi_cmnd and drop the #include "scsi.h".
The sun3_NCR5380.c core driver already uses struct scsi_cmnd so converting
the other core drivers reduces the diff which makes them easier to unify.

Signed-off-by: Finn Thain 
Reviewed-by: Hannes Reinecke 
Tested-by: Michael Schmitz 
Signed-off-by: Christoph Hellwig

ncr5380: Move static PDMA spin counters to host data

2014-11-20T08:11:09+00:00

Static variables from dtc.c and pas16.c should not appear in the core
NCR5380.c driver. Aside from being a layering issue this worsens the
divergence between the three core driver variants (atari_NCR5380.c and
sun3_NCR5380.c don't support PSEUDO_DMA) and it can mean multiple hosts
share the same counters.

Fix this by making the pseudo DMA spin counters in the core more generic.
This also avoids the abuse of the {DTC,PAS16}_PUBLIC_RELEASE macros, so
they can be removed.

oak.c doesn't use PDMA and hence it doesn't use the counters and hence it
needs no write_info() method. Remove it.

Signed-off-by: Finn Thain 
Reviewed-by: Hannes Reinecke 
Tested-by: Michael Schmitz 
Signed-off-by: Christoph Hellwig

ncr5380: Cleanup host info() methods

2014-11-20T08:11:08+00:00

If the host->info() method is not set, then host->name is used by default.
For atari_scsi, that is exactly the same text. So remove the redundant
info() method. Keep sun3_scsi.c in line with atari_scsi.

Some NCR5380 drivers return an empty string from the info() method
(arm/cumana_1.c arm/oak.c mac_scsi.c) while other drivers use the default
(dmx3191d dtc.c g_NCR5380.c pas16.c t128.c).

Implement a common info() method to replace a lot of duplicated code which
the various drivers use to announce the same information.

This replaces most of the (deprecated) show_info() output and all of the
NCR5380_print_info() output. This also eliminates a bunch of code in
g_NCR5380 which just duplicates functionality in the core driver.

Signed-off-by: Finn Thain 
Reviewed-by: Hannes Reinecke 
Tested-by: Michael Schmitz 
Signed-off-by: Christoph Hellwig

ncr5380: Fix SCSI_IRQ_NONE bugs

2014-11-20T08:11:07+00:00

Oak scsi doesn't use any IRQ, but it sets irq = IRQ_NONE rather than
SCSI_IRQ_NONE. Problem is, the core NCR5380 driver expects SCSI_IRQ_NONE
if it is to issue IDENTIFY commands that prevent target disconnection.
And, as Geert points out, IRQ_NONE is part of enum irqreturn.

Other drivers, when they can't get an IRQ or can't use one, will set
host->irq = SCSI_IRQ_NONE (that is, 255). But when they exit they will
attempt to free IRQ 255 which was never requested.

Fix these bugs by using NO_IRQ in place of SCSI_IRQ_NONE and IRQ_NONE.
That means IRQ 0 is no longer probed by ISA drivers but I don't think
this matters.

Setting IRQ = 255 for these ISA drivers is understood to mean no IRQ.
This remains supported so as to avoid breaking existing ISA setups (which
can be difficult to get working) and because existing documentation
(SANE, TLDP etc) describes this usage for the ISA NCR5380 driver options.

Signed-off-by: Finn Thain 
Reviewed-by: Hannes Reinecke 
Tested-by: Michael Schmitz 
Signed-off-by: Christoph Hellwig

ncr5380: Remove duplicate comments

2014-11-20T08:11:06+00:00

The LIMIT_TRANSFERSIZE, PSEUDO_DMA, PARITY and UNSAFE options are all
documented in the core drivers where they are used. The same goes for the
chip databook reference. Remove the duplicate comments.

Signed-off-by: Finn Thain 
Reviewed-by: Hannes Reinecke 
Signed-off-by: Christoph Hellwig

ncr5380: Remove redundant AUTOSENSE macro

2014-11-20T08:11:06+00:00

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 
Reviewed-by: Hannes Reinecke 
Tested-by: Michael Schmitz 
Signed-off-by: Christoph Hellwig

ncr5380: Remove more useless prototypes

2014-11-20T08:11:05+00:00

Make use of the host template static initializer instead of assigning
handlers at run-time. Move __maybe_unused qualifiers from declarations
to definitions. Move the atari_scsi_bus_reset() wrapper after the
definition of NCR5380_bus_reset(). All of the host template handler
prototypes are now redundant so remove them.

The write_info() handler is only relevant to drivers using PSEUDO_DMA so
this patch fixes the compiler warning in atari_NCR5380.c and sun3_NCR5380.c:

  CC      drivers/scsi/atari_scsi.o
  drivers/scsi/NCR5380.h:329: warning: 'NCR5380_write_info' declared 'static' but never defined

Signed-off-by: Finn Thain 
Tested-by: Michael Schmitz 
Reviewed-by: Hannes Reinecke 
Signed-off-by: Christoph Hellwig

ncr5380: Remove useless prototypes

2014-11-20T08:11:04+00:00

Add missing static qualifiers and remove the now pointless prototypes. The
NCR5380_* prototypes are all declared in NCR5380.h and renamed using macros.
Further declarations are redundant (some are completely unused). Remove
them.

Signed-off-by: Finn Thain 
Reviewed-by: Hannes Reinecke 
Tested-by: Michael Schmitz 
Signed-off-by: Christoph Hellwig

ncr5380: Remove unused macros

2014-11-20T08:11:04+00:00

Some macros are never evaluated (i.e. FOO, USLEEP, SCSI2 and USE_WRAPPER;
and in some drivers, NCR5380_intr and NCR5380_proc_info). DRIVER_SETUP
serves no purpose anymore. Remove these macro definitions.

Signed-off-by: Finn Thain 
Reviewed-by: Hannes Reinecke 
Tested-by: Michael Schmitz 
Signed-off-by: Christoph Hellwig

ncr5380: Fix compiler warnings and __setup options

2014-11-20T08:11:03+00:00

Some __setup() options mentioned in Documentation/scsi don't work because
a few lines of code went missing sometime since Linux 2.4. Fix the options
and thus fix some compiler warnings for both the non-modular case,

    CC      drivers/scsi/dtc.o
drivers/scsi/dtc.c:176:20: warning: 'dtc_setup' defined but not used [-Wunused-function]

and the modular case,

    CC [M]  drivers/scsi/pas16.o
drivers/scsi/pas16.c:335:20: warning: 'pas16_setup' defined but not used [-Wunused-function]
    CC [M]  drivers/scsi/t128.o
drivers/scsi/t128.c:147:20: warning: 't128_setup' defined but not used [-Wunused-function]

Signed-off-by: Finn Thain 
Reviewed-by: Hannes Reinecke 
Signed-off-by: Christoph Hellwig