mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-05 18:41:58 +09:00
UPSTREAM: scsi: core: Remove scsi_execute_req()/scsi_execute() functions
scsi_execute() and scsi_execute_req() are no longer used so remove them.
Change-Id: I8173edc95f4771163ff2384d7905e35a74111f63
Signed-off-by: Mike Christie <michael.christie@oracle.com>
Reviewed-by: John Garry <john.g.garry@oracle.com>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Bug: 267974767
(cherry picked from commit 946a10511f)
Signed-off-by: Bart Van Assche <bvanassche@google.com>
This commit is contained in:
@@ -470,37 +470,6 @@ int scsi_execute_cmd(struct scsi_device *sdev, const unsigned char *cmd,
|
||||
int timeout, int retries,
|
||||
const struct scsi_exec_args *args);
|
||||
|
||||
/* Make sure any sense buffer is the correct size. */
|
||||
#define scsi_execute(_sdev, _cmd, _data_dir, _buffer, _bufflen, _sense, \
|
||||
_sshdr, _timeout, _retries, _flags, _rq_flags, \
|
||||
_resid) \
|
||||
({ \
|
||||
scsi_execute_cmd(_sdev, _cmd, (_data_dir == DMA_TO_DEVICE ? \
|
||||
REQ_OP_DRV_OUT : REQ_OP_DRV_IN) | _flags, \
|
||||
_buffer, _bufflen, _timeout, _retries, \
|
||||
&(struct scsi_exec_args) { \
|
||||
.sense = _sense, \
|
||||
.sshdr = _sshdr, \
|
||||
.req_flags = _rq_flags & RQF_PM ? \
|
||||
BLK_MQ_REQ_PM : 0, \
|
||||
.resid = _resid, \
|
||||
}); \
|
||||
})
|
||||
|
||||
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_cmd(sdev, cmd,
|
||||
data_direction == DMA_TO_DEVICE ?
|
||||
REQ_OP_DRV_OUT : REQ_OP_DRV_IN, buffer,
|
||||
bufflen, timeout, retries,
|
||||
&(struct scsi_exec_args) {
|
||||
.sshdr = sshdr,
|
||||
.resid = resid,
|
||||
});
|
||||
}
|
||||
extern void sdev_disable_disk_events(struct scsi_device *sdev);
|
||||
extern void sdev_enable_disk_events(struct scsi_device *sdev);
|
||||
extern int scsi_vpd_lun_id(struct scsi_device *, char *, size_t);
|
||||
|
||||
Reference in New Issue
Block a user