diff options
author | <hch@lst.de> | 2005-04-17 16:26:13 -0400 |
---|---|---|
committer | James Bottomley <jejb@titanic> | 2005-04-18 14:49:58 -0400 |
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 f4ac37f157ea..684557474c15 100644 --- a/Documentation/DMA-mapping.txt +++ b/Documentation/DMA-mapping.txt | |||
@@ -443,15 +443,9 @@ Only streaming mappings specify a direction, consistent mappings | |||
443 | implicitly have a direction attribute setting of | 443 | implicitly have a direction attribute setting of |
444 | PCI_DMA_BIDIRECTIONAL. | 444 | PCI_DMA_BIDIRECTIONAL. |
445 | 445 | ||
446 | The SCSI subsystem provides mechanisms for you to easily obtain | 446 | The SCSI subsystem tells you the direction to use in the |
447 | the direction to use, in the SCSI command: | 447 | 'sc_data_direction' member of the SCSI command your driver is |
448 | 448 | working on. | |
449 | scsi_to_pci_dma_dir(SCSI_DIRECTION) | ||
450 | |||
451 | Where SCSI_DIRECTION is obtained from the 'sc_data_direction' | ||
452 | member of the SCSI command your driver is working on. The | ||
453 | mentioned interface above returns a value suitable for passing | ||
454 | into the streaming DMA mapping interfaces below. | ||
455 | 449 | ||
456 | For Networking drivers, it's a rather simple affair. For transmit | 450 | For Networking drivers, it's a rather simple affair. For transmit |
457 | packets, map/unmap them with the PCI_DMA_TODEVICE direction | 451 | 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 1f24129a3099..e41703d7d24d 100644 --- a/Documentation/scsi/scsi_mid_low_api.txt +++ b/Documentation/scsi/scsi_mid_low_api.txt | |||
@@ -389,8 +389,6 @@ Summary: | |||
389 | scsi_remove_host - detach and remove all SCSI devices owned by host | 389 | scsi_remove_host - detach and remove all SCSI devices owned by host |
390 | scsi_report_bus_reset - report scsi _bus_ reset observed | 390 | scsi_report_bus_reset - report scsi _bus_ reset observed |
391 | scsi_set_device - place device reference in host structure | 391 | scsi_set_device - place device reference in host structure |
392 | scsi_to_pci_dma_dir - convert SCSI subsystem direction flag to PCI | ||
393 | scsi_to_sbus_dma_dir - convert SCSI subsystem direction flag to SBUS | ||
394 | scsi_track_queue_full - track successive QUEUE_FULL events | 392 | scsi_track_queue_full - track successive QUEUE_FULL events |
395 | scsi_unblock_requests - allow further commands to be queued to given host | 393 | scsi_unblock_requests - allow further commands to be queued to given host |
396 | scsi_unregister - [calls scsi_host_put()] | 394 | scsi_unregister - [calls scsi_host_put()] |
@@ -757,48 +755,6 @@ void scsi_set_device(struct Scsi_Host * shost, struct device * dev) | |||
757 | 755 | ||
758 | 756 | ||
759 | /** | 757 | /** |
760 | * scsi_to_pci_dma_dir - convert SCSI subsystem direction flag to PCI | ||
761 | * @scsi_data_direction: SCSI subsystem direction flag | ||
762 | * | ||
763 | * Returns DMA_TO_DEVICE given SCSI_DATA_WRITE, | ||
764 | * DMA_FROM_DEVICE given SCSI_DATA_READ | ||
765 | * DMA_BIDIRECTIONAL given SCSI_DATA_UNKNOWN | ||
766 | * else returns DMA_NONE | ||
767 | * | ||
768 | * Might block: no | ||
769 | * | ||
770 | * Notes: The SCSI subsystem now uses the same values for these | ||
771 | * constants as the PCI subsystem so this function is a nop. | ||
772 | * The recommendation is not to use this conversion function anymore | ||
773 | * (in the 2.6 kernel series) as it is not needed. | ||
774 | * | ||
775 | * Defined in: drivers/scsi/scsi.h . | ||
776 | **/ | ||
777 | int scsi_to_pci_dma_dir(unsigned char scsi_data_direction) | ||
778 | |||
779 | |||
780 | /** | ||
781 | * scsi_to_sbus_dma_dir - convert SCSI subsystem direction flag to SBUS | ||
782 | * @scsi_data_direction: SCSI subsystem direction flag | ||
783 | * | ||
784 | * Returns DMA_TO_DEVICE given SCSI_DATA_WRITE, | ||
785 | * FROM_DEVICE given SCSI_DATA_READ | ||
786 | * DMA_BIDIRECTIONAL given SCSI_DATA_UNKNOWN | ||
787 | * else returns DMA_NONE | ||
788 | * | ||
789 | * Notes: The SCSI subsystem now uses the same values for these | ||
790 | * constants as the SBUS subsystem so this function is a nop. | ||
791 | * The recommendation is not to use this conversion function anymore | ||
792 | * (in the 2.6 kernel series) as it is not needed. | ||
793 | * | ||
794 | * Might block: no | ||
795 | * | ||
796 | * Defined in: drivers/scsi/scsi.h . | ||
797 | **/ | ||
798 | int scsi_to_sbus_dma_dir(unsigned char scsi_data_direction) | ||
799 | |||
800 | |||
801 | /** | ||
802 | * scsi_track_queue_full - track successive QUEUE_FULL events on given | 758 | * scsi_track_queue_full - track successive QUEUE_FULL events on given |
803 | * device to determine if and when there is a need | 759 | * device to determine if and when there is a need |
804 | * to adjust the queue depth on the device. | 760 | * to adjust the queue depth on the device. |