diff options
| author |   Finn Thain <fthain@telegraphics.com.au> | 2016-08-27 12:30:00 +1000 |
|---|---|---|
| committer |   Martin K. Petersen <martin.petersen@oracle.com> | 2016-08-31 00:25:18 -0400 |
| commit | 01f17641c4c6e7468bbd3d3f382c151db01dc0e8 (patch) | |
| tree | 54ecd7e68266177d4303be2224e09268765e24c2 /drivers/scsi/NCR5380.h | |
| parent | scsi: Documentation/scsi: Remove nodisconnect parameter (diff) | |
| download | linux-dev-01f17641c4c6e7468bbd3d3f382c151db01dc0e8.tar.xz linux-dev-01f17641c4c6e7468bbd3d3f382c151db01dc0e8.zip | |
scsi: ncr5380: Avoid a compiler warning
With commit 3a0f64bfa907 ("mac_scsi: Fix pseudo DMA implementation")
some versions of gcc now warn:
In file included from drivers/scsi/mac_scsi.c:335:
drivers/scsi/NCR5380.h:295: warning: `NCR5380_poll_politely' declared inline after being called
drivers/scsi/NCR5380.h:295: warning: previous declaration of `NCR5380_poll_politely' was here
Avoid this by defining NCR5380_poll_politely() in NCR5380.h.
[mkp: checkpatch warnings]
Suggested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/NCR5380.h')
| -rw-r--r-- | drivers/scsi/NCR5380.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/scsi/NCR5380.h b/drivers/scsi/NCR5380.h index c60728785d89..2ed61b5d40e6 100644 --- a/drivers/scsi/NCR5380.h +++ b/drivers/scsi/NCR5380.h @@ -292,8 +292,14 @@ static void NCR5380_reselect(struct Scsi_Host *instance); static struct scsi_cmnd *NCR5380_select(struct Scsi_Host *, struct scsi_cmnd *); static int NCR5380_transfer_dma(struct Scsi_Host *instance, unsigned char *phase, int *count, unsigned char **data); static int NCR5380_transfer_pio(struct Scsi_Host *instance, unsigned char *phase, int *count, unsigned char **data); -static int NCR5380_poll_politely(struct Scsi_Host *, int, int, int, int); static int NCR5380_poll_politely2(struct Scsi_Host *, int, int, int, int, int, int, int); +static inline int NCR5380_poll_politely(struct Scsi_Host *instance, + int reg, int bit, int val, int wait) +{ + return NCR5380_poll_politely2(instance, reg, bit, val, + reg, bit, val, wait); +} + #endif /* __KERNEL__ */ #endif /* NCR5380_H */ |