diff options
Diffstat (limited to 'include/scsi')
-rw-r--r-- | include/scsi/scsi_host.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index 603054d8f40c..6ff6bc18e294 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h | |||
@@ -683,6 +683,12 @@ struct Scsi_Host { | |||
683 | void *shost_data; | 683 | void *shost_data; |
684 | 684 | ||
685 | /* | 685 | /* |
686 | * Points to the physical bus device we'd use to do DMA | ||
687 | * Needed just in case we have virtual hosts. | ||
688 | */ | ||
689 | struct device *dma_dev; | ||
690 | |||
691 | /* | ||
686 | * We should ensure that this is aligned, both for better performance | 692 | * We should ensure that this is aligned, both for better performance |
687 | * and also because some compilers (m68k) don't automatically force | 693 | * and also because some compilers (m68k) don't automatically force |
688 | * alignment to a long boundary. | 694 | * alignment to a long boundary. |
@@ -726,7 +732,9 @@ extern int scsi_queue_work(struct Scsi_Host *, struct work_struct *); | |||
726 | extern void scsi_flush_work(struct Scsi_Host *); | 732 | extern void scsi_flush_work(struct Scsi_Host *); |
727 | 733 | ||
728 | extern struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *, int); | 734 | extern struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *, int); |
729 | extern int __must_check scsi_add_host(struct Scsi_Host *, struct device *); | 735 | extern int __must_check scsi_add_host_with_dma(struct Scsi_Host *, |
736 | struct device *, | ||
737 | struct device *); | ||
730 | extern void scsi_scan_host(struct Scsi_Host *); | 738 | extern void scsi_scan_host(struct Scsi_Host *); |
731 | extern void scsi_rescan_device(struct device *); | 739 | extern void scsi_rescan_device(struct device *); |
732 | extern void scsi_remove_host(struct Scsi_Host *); | 740 | extern void scsi_remove_host(struct Scsi_Host *); |
@@ -737,6 +745,12 @@ extern const char *scsi_host_state_name(enum scsi_host_state); | |||
737 | 745 | ||
738 | extern u64 scsi_calculate_bounce_limit(struct Scsi_Host *); | 746 | extern u64 scsi_calculate_bounce_limit(struct Scsi_Host *); |
739 | 747 | ||
748 | static inline int __must_check scsi_add_host(struct Scsi_Host *host, | ||
749 | struct device *dev) | ||
750 | { | ||
751 | return scsi_add_host_with_dma(host, dev, dev); | ||
752 | } | ||
753 | |||
740 | static inline struct device *scsi_get_device(struct Scsi_Host *shost) | 754 | static inline struct device *scsi_get_device(struct Scsi_Host *shost) |
741 | { | 755 | { |
742 | return shost->shost_gendev.parent; | 756 | return shost->shost_gendev.parent; |