Skip to content

Commit

Permalink
atari_scsi: Remove header
Browse files Browse the repository at this point in the history
The #defines in atari_scsi.h are intended to influence subsequent #includes
in atari_scsi.c. IMHO, that's too convoluted.

Remove atari_scsi.h by moving those macro definitions to atari_scsi.c,
consistent with other NCR5380 drivers.

Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Tested-by: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
  • Loading branch information
Finn Thain authored and Christoph Hellwig committed Nov 20, 2014
1 parent 3ff228a commit 4e70520
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 49 deletions.
35 changes: 26 additions & 9 deletions drivers/scsi/atari_scsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,7 @@
/**************************************************************************/



#include <linux/module.h>

/* For the Atari version, use only polled IO or REAL_DMA */
#define REAL_DMA
/* Support tagged queuing? (on devices that are able to... :-) */
#define SUPPORT_TAGS
#define MAX_TAGS 32

#include <linux/types.h>
#include <linux/delay.h>
#include <linux/blkdev.h>
Expand All @@ -92,9 +84,34 @@

#include <scsi/scsi_host.h>

#include "atari_scsi.h"
/* Definitions for the core NCR5380 driver. */

#define REAL_DMA
#define SUPPORT_TAGS
#define MAX_TAGS 32

#define NCR5380_implementation_fields /* none */

#define NCR5380_read(reg) atari_scsi_reg_read(reg)
#define NCR5380_write(reg, value) atari_scsi_reg_write(reg, value)

#define NCR5380_queue_command atari_scsi_queue_command
#define NCR5380_abort atari_scsi_abort
#define NCR5380_show_info atari_scsi_show_info
#define NCR5380_info atari_scsi_info

#define NCR5380_dma_read_setup(instance, data, count) \
atari_scsi_dma_setup(instance, data, count, 0)
#define NCR5380_dma_write_setup(instance, data, count) \
atari_scsi_dma_setup(instance, data, count, 1)
#define NCR5380_dma_residual(instance) \
atari_scsi_dma_residual(instance)
#define NCR5380_dma_xfer_len(instance, cmd, phase) \
atari_dma_xfer_len(cmd->SCp.this_residual, cmd, !((phase) & SR_IO))

#include "NCR5380.h"


#define IS_A_TT() ATARIHW_PRESENT(TT_SCSI)

#define SCSI_DMA_WRITE_P(elt,val) \
Expand Down
40 changes: 0 additions & 40 deletions drivers/scsi/atari_scsi.h

This file was deleted.

0 comments on commit 4e70520

Please sign in to comment.