Commit 01f17641 authored by Finn Thain's avatar Finn Thain Committed by Martin K. Petersen
Browse files

scsi: ncr5380: Avoid a compiler warning 



With commit 3a0f64bf ("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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Tested-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 35d0acba

drivers/scsi/NCR5380.c

+0 −7
Original line number Diff line number Diff line
@@ -230,13 +230,6 @@ static int NCR5380_poll_politely2(struct Scsi_Host *instance, 
	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;

drivers/scsi/NCR5380.h

+7 −1
Original line number Diff line number Diff line
@@ -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 */