diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-17 19:20:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-17 19:20:45 -0400 |
| commit | 4e7fca0d0afdfa6be0f429f9a2649b3cf92197e7 (patch) | |
| tree | 91ef397b12a6a8ea9e89aa2b162709ddea2a6127 /include/scsi | |
| parent | e9ab22d292aa168ed8d4cb45353a626a3d6f1522 (diff) | |
| parent | f9114d357858c1429dcde022706db7443918f49f (diff) | |
Merge branch 'for-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata fixes from Tejun Heo:
"Three minor device-specific fixes and revert of NCQ autosense added
during this -rc1.
It turned out that NCQ autosense as currently implemented interferes
with the usual error handling behavior. It will be revisited in the
near future"
* 'for-4.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
ata: ahci_brcmstb: Fix misuse of IS_ENABLED
sata_sx4: Check return code from pdc20621_i2c_read()
Revert "libata: Implement NCQ autosense"
Revert "libata: Implement support for sense data reporting"
Revert "libata-eh: Set 'information' field for autosense"
ata: ahci_brcmstb: Fix warnings with CONFIG_PM_SLEEP=n
Diffstat (limited to 'include/scsi')
| -rw-r--r-- | include/scsi/scsi_eh.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/scsi/scsi_eh.h b/include/scsi/scsi_eh.h index 4942710ef720..8d1d7fa67ec4 100644 --- a/include/scsi/scsi_eh.h +++ b/include/scsi/scsi_eh.h | |||
| @@ -28,7 +28,6 @@ extern int scsi_get_sense_info_fld(const u8 * sense_buffer, int sb_len, | |||
| 28 | u64 * info_out); | 28 | u64 * info_out); |
| 29 | 29 | ||
| 30 | extern void scsi_build_sense_buffer(int desc, u8 *buf, u8 key, u8 asc, u8 ascq); | 30 | extern void scsi_build_sense_buffer(int desc, u8 *buf, u8 key, u8 asc, u8 ascq); |
| 31 | extern void scsi_set_sense_information(u8 *buf, u64 info); | ||
| 32 | 31 | ||
| 33 | extern int scsi_ioctl_reset(struct scsi_device *, int __user *); | 32 | extern int scsi_ioctl_reset(struct scsi_device *, int __user *); |
| 34 | 33 | ||