diff options
Diffstat (limited to 'include/scsi/sas_ata.h')
-rw-r--r-- | include/scsi/sas_ata.h | 57 |
1 files changed, 17 insertions, 40 deletions
diff --git a/include/scsi/sas_ata.h b/include/scsi/sas_ata.h index ff71a565468..9c159f74c6d 100644 --- a/include/scsi/sas_ata.h +++ b/include/scsi/sas_ata.h | |||
@@ -32,22 +32,19 @@ | |||
32 | 32 | ||
33 | static inline int dev_is_sata(struct domain_device *dev) | 33 | static inline int dev_is_sata(struct domain_device *dev) |
34 | { | 34 | { |
35 | return dev->dev_type == SATA_DEV || dev->dev_type == SATA_PM || | 35 | return (dev->rphy->identify.target_port_protocols & SAS_PROTOCOL_SATA); |
36 | dev->dev_type == SATA_PM_PORT || dev->dev_type == SATA_PENDING; | ||
37 | } | 36 | } |
38 | 37 | ||
39 | int sas_get_ata_info(struct domain_device *dev, struct ex_phy *phy); | 38 | int sas_ata_init_host_and_port(struct domain_device *found_dev, |
40 | int sas_ata_init(struct domain_device *dev); | 39 | struct scsi_target *starget); |
40 | |||
41 | void sas_ata_task_abort(struct sas_task *task); | 41 | void sas_ata_task_abort(struct sas_task *task); |
42 | void sas_ata_strategy_handler(struct Scsi_Host *shost); | 42 | void sas_ata_strategy_handler(struct Scsi_Host *shost); |
43 | void sas_ata_eh(struct Scsi_Host *shost, struct list_head *work_q, | 43 | int sas_ata_timed_out(struct scsi_cmnd *cmd, struct sas_task *task, |
44 | struct list_head *done_q); | 44 | enum blk_eh_timer_return *rtn); |
45 | void sas_ata_schedule_reset(struct domain_device *dev); | 45 | int sas_ata_eh(struct Scsi_Host *shost, struct list_head *work_q, |
46 | void sas_ata_wait_eh(struct domain_device *dev); | 46 | struct list_head *done_q); |
47 | void sas_probe_sata(struct asd_sas_port *port); | 47 | |
48 | void sas_suspend_sata(struct asd_sas_port *port); | ||
49 | void sas_resume_sata(struct asd_sas_port *port); | ||
50 | void sas_ata_end_eh(struct ata_port *ap); | ||
51 | #else | 48 | #else |
52 | 49 | ||
53 | 50 | ||
@@ -55,7 +52,8 @@ static inline int dev_is_sata(struct domain_device *dev) | |||
55 | { | 52 | { |
56 | return 0; | 53 | return 0; |
57 | } | 54 | } |
58 | static inline int sas_ata_init(struct domain_device *dev) | 55 | static inline int sas_ata_init_host_and_port(struct domain_device *found_dev, |
56 | struct scsi_target *starget) | ||
59 | { | 57 | { |
60 | return 0; | 58 | return 0; |
61 | } | 59 | } |
@@ -67,39 +65,18 @@ static inline void sas_ata_strategy_handler(struct Scsi_Host *shost) | |||
67 | { | 65 | { |
68 | } | 66 | } |
69 | 67 | ||
70 | static inline void sas_ata_eh(struct Scsi_Host *shost, struct list_head *work_q, | 68 | static inline int sas_ata_timed_out(struct scsi_cmnd *cmd, |
71 | struct list_head *done_q) | 69 | struct sas_task *task, |
72 | { | 70 | enum blk_eh_timer_return *rtn) |
73 | } | ||
74 | |||
75 | static inline void sas_ata_schedule_reset(struct domain_device *dev) | ||
76 | { | ||
77 | } | ||
78 | |||
79 | static inline void sas_ata_wait_eh(struct domain_device *dev) | ||
80 | { | ||
81 | } | ||
82 | |||
83 | static inline void sas_probe_sata(struct asd_sas_port *port) | ||
84 | { | ||
85 | } | ||
86 | |||
87 | static inline void sas_suspend_sata(struct asd_sas_port *port) | ||
88 | { | ||
89 | } | ||
90 | |||
91 | static inline void sas_resume_sata(struct asd_sas_port *port) | ||
92 | { | 71 | { |
72 | return 0; | ||
93 | } | 73 | } |
94 | 74 | static inline int sas_ata_eh(struct Scsi_Host *shost, struct list_head *work_q, | |
95 | static inline int sas_get_ata_info(struct domain_device *dev, struct ex_phy *phy) | 75 | struct list_head *done_q) |
96 | { | 76 | { |
97 | return 0; | 77 | return 0; |
98 | } | 78 | } |
99 | 79 | ||
100 | static inline void sas_ata_end_eh(struct ata_port *ap) | ||
101 | { | ||
102 | } | ||
103 | #endif | 80 | #endif |
104 | 81 | ||
105 | #endif /* _SAS_ATA_H_ */ | 82 | #endif /* _SAS_ATA_H_ */ |