mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 21:54:34 -04:00
Merge branch 'postmerge' into for-linus
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
commit
297b8a0734
4 changed files with 93 additions and 38 deletions
|
|
@ -394,10 +394,18 @@ extern int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd,
|
|||
int data_direction, void *buffer, unsigned bufflen,
|
||||
unsigned char *sense, int timeout, int retries,
|
||||
int flag, int *resid);
|
||||
extern int scsi_execute_req(struct scsi_device *sdev, const unsigned char *cmd,
|
||||
int data_direction, void *buffer, unsigned bufflen,
|
||||
struct scsi_sense_hdr *, int timeout, int retries,
|
||||
int *resid);
|
||||
extern int scsi_execute_req_flags(struct scsi_device *sdev,
|
||||
const unsigned char *cmd, int data_direction, void *buffer,
|
||||
unsigned bufflen, struct scsi_sense_hdr *sshdr, int timeout,
|
||||
int retries, int *resid, int flags);
|
||||
static inline int scsi_execute_req(struct scsi_device *sdev,
|
||||
const unsigned char *cmd, int data_direction, void *buffer,
|
||||
unsigned bufflen, struct scsi_sense_hdr *sshdr, int timeout,
|
||||
int retries, int *resid)
|
||||
{
|
||||
return scsi_execute_req_flags(sdev, cmd, data_direction, buffer,
|
||||
bufflen, sshdr, timeout, retries, resid, 0);
|
||||
}
|
||||
extern void sdev_disable_disk_events(struct scsi_device *sdev);
|
||||
extern void sdev_enable_disk_events(struct scsi_device *sdev);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue