Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

[~andy/linux] / include / scsi / sas_ata.h

diff --git a/include/scsi/sas_ata.h b/include/scsi/sas_ata.h
index dd5edc915417bf9c9538059091bfc5a7e654c5f3..9c159f74c6d038fcd88d49e03db1fc5e0d55bbaa 100644 (file)
--- a/include/scsi/sas_ata.h
+++ b/include/scsi/sas_ata.h
@@ -39,6 +39,11 @@ 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);
+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
 
@@ -47,14 +52,31 @@ static inline int dev_is_sata(struct domain_device *dev)
 {
        return 0;
 }
-int sas_ata_init_host_and_port(struct domain_device *found_dev,
+static inline int sas_ata_init_host_and_port(struct domain_device *found_dev,
                               struct scsi_target *starget)
 {
        return 0;
 }
-void sas_ata_task_abort(struct sas_task *task)
+static inline void sas_ata_task_abort(struct sas_task *task)
+{
+}
+
+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;
 }
+
 #endif
 
 #endif /* _SAS_ATA_H_ */