Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5299b3ca authored by Finn Thain's avatar Finn Thain Committed by Martin K. Petersen
Browse files

ncr5380: Remove redundant volatile qualifiers 



The hostdata struct is now protected by a spin lock so the volatile
qualifiers are redundant. Remove them.

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 9903fa91

drivers/scsi/NCR5380.h

+6 −6
Original line number Diff line number Diff line
@@ -248,14 +248,14 @@ struct NCR5380_hostdata { 
	NCR5380_implementation_fields;		/* implementation specific */

	struct Scsi_Host *host;			/* Host backpointer */

	unsigned char id_mask, id_higher_mask;	/* 1 << id, all bits greater */

	volatile unsigned char busy[8];		/* index = target, bit = lun */

	unsigned char busy[8];			/* index = target, bit = lun */

#if defined(REAL_DMA) || defined(REAL_DMA_POLL)

	volatile int dma_len;			/* requested length of DMA */

	int dma_len;				/* requested length of DMA */

#endif

	volatile unsigned char last_message;	/* last message OUT */

	volatile struct scsi_cmnd *connected;	/* currently connected command */

	volatile struct scsi_cmnd *issue_queue;	/* waiting to be issued */

	volatile struct scsi_cmnd *disconnected_queue;	/* waiting for reconnect */

	unsigned char last_message;		/* last message OUT */

	struct scsi_cmnd *connected;		/* currently connected cmnd */

	struct scsi_cmnd *issue_queue;		/* waiting to be issued */

	struct scsi_cmnd *disconnected_queue;	/* waiting for reconnect */

	spinlock_t lock;			/* protects this struct */

	int flags;

	struct scsi_eh_save ses;

drivers/scsi/atari_NCR5380.c

+1 −1
Original line number Diff line number Diff line
@@ -1009,7 +1009,7 @@ static void NCR5380_dma_complete(struct Scsi_Host *instance) 
	struct NCR5380_hostdata *hostdata = shost_priv(instance);

	int transferred;

	unsigned char **data;

	volatile int *count;

	int *count;

	int saved_data = 0, overrun = 0;

	unsigned char p;