diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-03 19:29:43 +0900 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-03 19:29:43 +0900 |
commit | f94f3cb37a1c4d44dd2070cc4a6165689bda9c92 (patch) | |
tree | 21bbdeacbc1b9895cf917231d1675eaaa63b9229 /include/scsi/sas_ata.h | |
parent | e27808df97ff7b43b4927aadf410705f33313523 (diff) | |
parent | 1b4610ebf37a05a65e9f29cdf4d87c207573104d (diff) | |
download | blackbird-obmc-linux-f94f3cb37a1c4d44dd2070cc4a6165689bda9c92.tar.gz blackbird-obmc-linux-f94f3cb37a1c4d44dd2070cc4a6165689bda9c92.zip |
Merge branch 'for-2.6.39' into for-2.6.40
Diffstat (limited to 'include/scsi/sas_ata.h')
-rw-r--r-- | include/scsi/sas_ata.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/include/scsi/sas_ata.h b/include/scsi/sas_ata.h index c583193ae929..9c159f74c6d0 100644 --- 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 @@ -55,6 +60,23 @@ static inline int sas_ata_init_host_and_port(struct domain_device *found_dev, 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_ */ |