diff options
author | <hch@lst.de> | 2005-04-17 15:26:13 -0500 |
---|---|---|
committer | James Bottomley <jejb@titanic> | 2005-04-18 13:49:58 -0500 |
commit | be7db055dd7261522557046370f49160728e3847 (patch) | |
tree | 314689dfb551ee9ad5ef8c27576762489a51897d /Documentation | |
parent | 80e2ca3dcb1043420ac4b06de8eed3d6fedaddda (diff) |
[PATCH] remove old scsi data direction macros
these have been wrappers for the generic dma direction bits since 2.5.x.
This patch converts the few remaining drivers and removes the macros.
Arjan noticed there's some hunk in here that shouldn't. Updated patch
below:
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/DMA-mapping.txt | 12 | ||||
-rw-r--r-- | Documentation/scsi/scsi_mid_low_api.txt | 44 |
2 files changed, 3 insertions, 53 deletions
diff --git a/Documentation/DMA-mapping.txt b/Documentation/DMA-mapping.txt index f4ac37f157e..684557474c1 100644 --- a/Documentation/DMA-mapping.txt +++ b/Documentation/DMA-mapping.txt @@ -443,15 +443,9 @@ Only streaming mappings specify a direction, consistent mappings implicitly have a direction attribute setting of PCI_DMA_BIDIRECTIONAL. -The SCSI subsystem provides mechanisms for you to easily obtain -the direction to use, in the SCSI command: - - scsi_to_pci_dma_dir(SCSI_DIRECTION) - -Where SCSI_DIRECTION is obtained from the 'sc_data_direction' -member of the SCSI command your driver is working on. The -mentioned interface above returns a value suitable for passing -into the streaming DMA mapping interfaces below. +The SCSI subsystem tells you the direction to use in the +'sc_data_direction' member of the SCSI command your driver is +working on. For Networking drivers, it's a rather simple affair. For transmit packets, map/unmap them with the PCI_DMA_TODEVICE direction diff --git a/Documentation/scsi/scsi_mid_low_api.txt b/Documentation/scsi/scsi_mid_low_api.txt index 1f24129a309..e41703d7d24 100644 --- a/Documentation/scsi/scsi_mid_low_api.txt +++ b/Documentation/scsi/scsi_mid_low_api.txt @@ -389,8 +389,6 @@ Summary: scsi_remove_host - detach and remove all SCSI devices owned by host scsi_report_bus_reset - report scsi _bus_ reset observed scsi_set_device - place device reference in host structure - scsi_to_pci_dma_dir - convert SCSI subsystem direction flag to PCI - scsi_to_sbus_dma_dir - convert SCSI subsystem direction flag to SBUS scsi_track_queue_full - track successive QUEUE_FULL events scsi_unblock_requests - allow further commands to be queued to given host scsi_unregister - [calls scsi_host_put()] @@ -757,48 +755,6 @@ void scsi_set_device(struct Scsi_Host * shost, struct device * dev) /** - * scsi_to_pci_dma_dir - convert SCSI subsystem direction flag to PCI - * @scsi_data_direction: SCSI subsystem direction flag - * - * Returns DMA_TO_DEVICE given SCSI_DATA_WRITE, - * DMA_FROM_DEVICE given SCSI_DATA_READ - * DMA_BIDIRECTIONAL given SCSI_DATA_UNKNOWN - * else returns DMA_NONE - * - * Might block: no - * - * Notes: The SCSI subsystem now uses the same values for these - * constants as the PCI subsystem so this function is a nop. - * The recommendation is not to use this conversion function anymore - * (in the 2.6 kernel series) as it is not needed. - * - * Defined in: drivers/scsi/scsi.h . - **/ -int scsi_to_pci_dma_dir(unsigned char scsi_data_direction) - - -/** - * scsi_to_sbus_dma_dir - convert SCSI subsystem direction flag to SBUS - * @scsi_data_direction: SCSI subsystem direction flag - * - * Returns DMA_TO_DEVICE given SCSI_DATA_WRITE, - * FROM_DEVICE given SCSI_DATA_READ - * DMA_BIDIRECTIONAL given SCSI_DATA_UNKNOWN - * else returns DMA_NONE - * - * Notes: The SCSI subsystem now uses the same values for these - * constants as the SBUS subsystem so this function is a nop. - * The recommendation is not to use this conversion function anymore - * (in the 2.6 kernel series) as it is not needed. - * - * Might block: no - * - * Defined in: drivers/scsi/scsi.h . - **/ -int scsi_to_sbus_dma_dir(unsigned char scsi_data_direction) - - -/** * scsi_track_queue_full - track successive QUEUE_FULL events on given * device to determine if and when there is a need * to adjust the queue depth on the device. |