[SCSI] libsas: execute transport link resets with libata-eh via host workqueue

[cascardo/linux.git] / include / scsi / sas_ata.h

diff --git a/include/scsi/sas_ata.h b/include/scsi/sas_ata.h
index 9c159f7..da3f377 100644 (file)
--- a/include/scsi/sas_ata.h
+++ b/include/scsi/sas_ata.h
@@ -32,7 +32,8 @@
 
 static inline int dev_is_sata(struct domain_device *dev)
 {
-       return (dev->rphy->identify.target_port_protocols & SAS_PROTOCOL_SATA);
+       return dev->dev_type == SATA_DEV || dev->dev_type == SATA_PM ||
+              dev->dev_type == SATA_PM_PORT;
 }
 
 int sas_ata_init_host_and_port(struct domain_device *found_dev,
@@ -40,11 +41,11 @@ int sas_ata_init_host_and_port(struct domain_device *found_dev,
 
 void sas_ata_task_abort(struct sas_task *task);
 void sas_ata_strategy_handler(struct Scsi_Host *shost);
-int sas_ata_timed_out(struct scsi_cmnd *cmd, struct sas_task *task,
-                     enum blk_eh_timer_return *rtn);
 int sas_ata_eh(struct Scsi_Host *shost, struct list_head *work_q,
               struct list_head *done_q);
-
+void sas_probe_sata(struct work_struct *work);
+void sas_ata_schedule_reset(struct domain_device *dev);
+void sas_ata_wait_eh(struct domain_device *dev);
 #else
 
 
@@ -65,18 +66,23 @@ static inline void sas_ata_strategy_handler(struct Scsi_Host *shost)
 {
 }
 
-static inline int sas_ata_timed_out(struct scsi_cmnd *cmd,
-                                   struct sas_task *task,
-                                   enum blk_eh_timer_return *rtn)
-{
-       return 0;
-}
 static inline int sas_ata_eh(struct Scsi_Host *shost, struct list_head *work_q,
                             struct list_head *done_q)
 {
        return 0;
 }
 
+static inline void sas_probe_sata(struct work_struct *work)
+{
+}
+
+static inline void sas_ata_schedule_reset(struct domain_device *dev)
+{
+}
+
+static inline void sas_ata_wait_eh(struct domain_device *dev)
+{
+}
 #endif
 
 #endif /* _SAS_ATA_H_ */