iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: ncr5380: Resolve various static checker warnings

Browse Source 
Avoid various warnings from "make C=1" by annotating a couple of
unlock-then-lock sequences, replacing a zero with NULL and correcting
some type casts.

Also avoid a warning from "make W=1" by adding braces.

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Tested-by: Ondrej Zary <linux@rainbow-software.org>
Tested-by: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Finn Thain 2017-01-15 18:50:57 -05:00 committed by Martin K. Petersen
parent 14d739f640
commit 4ab2a7878f
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/scsi/NCR5380.c
View File

@ -591,8 +591,9 @@ static inline void maybe_release_dma_irq(struct Scsi_Host *instance)
list_empty(&hostdata->unissued) && list_empty(&hostdata->unissued) &&
list_empty(&hostdata->autosense) && list_empty(&hostdata->autosense) &&
!hostdata->connected && !hostdata->connected &&
!hostdata->selecting) !hostdata->selecting) {
NCR5380_release_dma_irq(instance); NCR5380_release_dma_irq(instance);
}
} }
/** /**
@ -931,6 +932,7 @@ static irqreturn_t __maybe_unused NCR5380_intr(int irq, void *dev_id)
static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance, static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *instance,
struct scsi_cmnd *cmd) struct scsi_cmnd *cmd)
__releases(&hostdata->lock) __acquires(&hostdata->lock)
{ {
struct NCR5380_hostdata *hostdata = shost_priv(instance); struct NCR5380_hostdata *hostdata = shost_priv(instance);
unsigned char tmp[3], phase; unsigned char tmp[3], phase;
@ -1623,6 +1625,7 @@ static int NCR5380_transfer_dma(struct Scsi_Host *instance,
*/ */
static void NCR5380_information_transfer(struct Scsi_Host *instance) static void NCR5380_information_transfer(struct Scsi_Host *instance)
__releases(&hostdata->lock) __acquires(&hostdata->lock)
{ {
struct NCR5380_hostdata *hostdata = shost_priv(instance); struct NCR5380_hostdata *hostdata = shost_priv(instance);
unsigned char msgout = NOP; unsigned char msgout = NOP;

2
drivers/scsi/atari_scsi.c
View File

@ -782,7 +782,7 @@ static int __init atari_scsi_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
} }
atari_dma_phys_buffer = atari_stram_to_phys(atari_dma_buffer); atari_dma_phys_buffer = atari_stram_to_phys(atari_dma_buffer);
atari_dma_orig_addr = 0; atari_dma_orig_addr = NULL;
} }
instance = scsi_host_alloc(&atari_scsi_template, instance = scsi_host_alloc(&atari_scsi_template,

8
drivers/scsi/mac_scsi.c
View File

@ -154,7 +154,7 @@ __asm__ __volatile__ \
static inline int macscsi_pread(struct NCR5380_hostdata *hostdata, static inline int macscsi_pread(struct NCR5380_hostdata *hostdata,
unsigned char *dst, int len) unsigned char *dst, int len)
{ {
unsigned char *s = hostdata->pdma_io + (INPUT_DATA_REG << 4); u8 __iomem *s = hostdata->pdma_io + (INPUT_DATA_REG << 4);
unsigned char *d = dst; unsigned char *d = dst;
int n = len; int n = len;
int transferred; int transferred;
@ -257,7 +257,7 @@ static inline int macscsi_pwrite(struct NCR5380_hostdata *hostdata,
unsigned char *src, int len) unsigned char *src, int len)
{ {
unsigned char *s = src; unsigned char *s = src;
unsigned char *d = hostdata->pdma_io + (OUTPUT_DATA_REG << 4); u8 __iomem *d = hostdata->pdma_io + (OUTPUT_DATA_REG << 4);
int n = len; int n = len;
int transferred; int transferred;
@ -381,10 +381,10 @@ static int __init mac_scsi_probe(struct platform_device *pdev)
hostdata = shost_priv(instance); hostdata = shost_priv(instance);
hostdata->base = pio_mem->start; hostdata->base = pio_mem->start;
hostdata->io = (void *)pio_mem->start; hostdata->io = (u8 __iomem *)pio_mem->start;
if (pdma_mem && setup_use_pdma) if (pdma_mem && setup_use_pdma)
hostdata->pdma_io = (void *)pdma_mem->start; hostdata->pdma_io = (u8 __iomem *)pdma_mem->start;
else else
host_flags |= FLAG_NO_PSEUDO_DMA; host_flags |= FLAG_NO_PSEUDO_DMA;