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. Suggested-by: Geert Uytterhoeven Signed-off-by: Finn Thain --- drivers/scsi/NCR5380.c | 7 ------- drivers/scsi/NCR5380.h | 8 +++++++- 2 files changed, 7 insertions(+), 8 deletions(-) Index: linux/drivers/scsi/NCR5380.c =================================================================== --- linux.orig/drivers/scsi/NCR5380.c 2016-08-27 12:29:57.000000000 +1000 +++ linux/drivers/scsi/NCR5380.c 2016-08-27 12:29:57.000000000 +1000 @@ -230,13 +230,6 @@ static int NCR5380_poll_politely2(struct return -ETIMEDOUT; } -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); -} - #if NDEBUG static struct { unsigned char mask; Index: linux/drivers/scsi/NCR5380.h =================================================================== --- linux.orig/drivers/scsi/NCR5380.h 2016-08-27 12:29:57.000000000 +1000 +++ linux/drivers/scsi/NCR5380.h 2016-08-27 12:29:57.000000000 +1000 @@ -292,8 +292,14 @@ static void NCR5380_reselect(struct Scsi 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 */