Commit 7c606631 authored by Finn Thain's avatar Finn Thain Committed by Martin K. Petersen
Browse files

scsi: ncr5380: Expedite register polling 



Avoid the call to NCR5380_poll_politely2() when possible. The call is
easily short-circuited on the PIO fast path, using the inline wrapper.
This requires that the NCR5380_read macro be made available before
any #include "NCR5380.h" so a few declarations have to be moved too.

Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Tested-by: default avatarOndrej Zary <linux@rainbow-software.org>
Tested-by: default avatarMichael Schmitz <schmitzmic@gmail.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent d5d37a0a

drivers/scsi/NCR5380.h

+3 −0
Original line number Diff line number Diff line
@@ -310,6 +310,9 @@ static inline int NCR5380_poll_politely(struct NCR5380_hostdata *hostdata, 
                                        unsigned int reg, u8 bit, u8 val,

                                        unsigned long wait)

{

	if ((NCR5380_read(reg) & bit) == val)

		return 0;



	return NCR5380_poll_politely2(hostdata, reg, bit, val,

						reg, bit, val, wait);

}

drivers/scsi/arm/cumana_1.c

+4 −0
Original line number Diff line number Diff line
@@ -29,6 +29,10 @@ 
#define NCR5380_implementation_fields	\

	unsigned ctrl



struct NCR5380_hostdata;

static u8 cumanascsi_read(struct NCR5380_hostdata *, unsigned int);

static void cumanascsi_write(struct NCR5380_hostdata *, unsigned int, u8);



#include "../NCR5380.h"



#define CTRL	0x16fc

drivers/scsi/atari_scsi.c

+3 −3
Original line number Diff line number Diff line
@@ -57,6 +57,9 @@ 


#define NCR5380_implementation_fields   /* none */



static u8 (*atari_scsi_reg_read)(unsigned int);

static void (*atari_scsi_reg_write)(unsigned int, u8);



#define NCR5380_read(reg)               atari_scsi_reg_read(reg)

#define NCR5380_write(reg, value)       atari_scsi_reg_write(reg, value)
@@ -126,9 +129,6 @@ static inline unsigned long SCSI_DMA_GETADR(void) 


static void atari_scsi_fetch_restbytes(void);



static u8 (*atari_scsi_reg_read)(unsigned int);

static void (*atari_scsi_reg_write)(unsigned int, u8);



static unsigned long	atari_dma_residual, atari_dma_startaddr;

static short		atari_dma_active;

/* pointer to the dribble buffer */