Patched in Tegra support.

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 @@
 
 static inline int dev_is_sata(struct domain_device *dev)
 {
-        return dev->dev_type == SATA_DEV || dev->dev_type == SATA_PM ||
-               dev->dev_type == SATA_PM_PORT || dev->dev_type == SATA_PENDING;
+        return (dev->rphy->identify.target_port_protocols & SAS_PROTOCOL_SATA);
 }
 
-int sas_get_ata_info(struct domain_device *dev, struct ex_phy *phy);
-int sas_ata_init(struct domain_device *dev);
+int sas_ata_init_host_and_port(struct domain_device *found_dev,
+                               struct scsi_target *starget);
+
 void sas_ata_task_abort(struct sas_task *task);
 void sas_ata_strategy_handler(struct Scsi_Host *shost);
-void sas_ata_eh(struct Scsi_Host *shost, struct list_head *work_q,
-                struct list_head *done_q);
-void sas_ata_schedule_reset(struct domain_device *dev);
-void sas_ata_wait_eh(struct domain_device *dev);
-void sas_probe_sata(struct asd_sas_port *port);
-void sas_suspend_sata(struct asd_sas_port *port);
-void sas_resume_sata(struct asd_sas_port *port);
-void sas_ata_end_eh(struct ata_port *ap);
+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);
+
 #else
 
 
@@ -55,7 +52,8 @@ static inline int dev_is_sata(struct domain_device *dev)
 {
         return 0;
 }
-static inline int sas_ata_init(struct domain_device *dev)
+static inline int sas_ata_init_host_and_port(struct domain_device *found_dev,
+                               struct scsi_target *starget)
 {
         return 0;
 }
@@ -67,39 +65,18 @@ static inline void sas_ata_strategy_handler(struct Scsi_Host *shost)
 {
 }
 
-static inline void sas_ata_eh(struct Scsi_Host *shost, struct list_head *work_q,
-                              struct list_head *done_q)
-{
-}
-
-static inline void sas_ata_schedule_reset(struct domain_device *dev)
-{
-}
-
-static inline void sas_ata_wait_eh(struct domain_device *dev)
-{
-}
-
-static inline void sas_probe_sata(struct asd_sas_port *port)
-{
-}
-
-static inline void sas_suspend_sata(struct asd_sas_port *port)
-{
-}
-
-static inline void sas_resume_sata(struct asd_sas_port *port)
+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_get_ata_info(struct domain_device *dev, struct ex_phy *phy)
+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_ata_end_eh(struct ata_port *ap)
-{
-}
 #endif
 
 #endif /* _SAS_ATA_H_ */