[PATCH v2 19/35] scsi: Remove scsi_execute functions

Mike Christie
2022-09-29T02:57:07Z

scsi_execute* is no longer used so remove them.

Signed-off-by: Mike Christie <michael.christie@oracle.com>
---
include/scsi/scsi_device.h | 39 --------------------------------------
1 file changed, 39 deletions(-)

diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index d623d3e62f92..77bbd311ba34 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -481,45 +481,6 @@ extern int __scsi_exec_req(struct scsi_exec_args *args);
_args.sense_len != SCSI_SENSE_BUFFERSIZE); \
__scsi_exec_req(&_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) \
-({ \
- BUILD_BUG_ON((_sense) != NULL && \
- sizeof(_sense) != SCSI_SENSE_BUFFERSIZE); \
- __scsi_exec_req(&((struct scsi_exec_args) { \
- .sdev = _sdev, \
- .cmd = _cmd, \
- .data_dir = _data_dir, \
- .buf = _buffer, \
- .buf_len = _bufflen, \
- .sense = _sense, \
- .sshdr = _sshdr, \
- .timeout = _timeout, \
- .retries = _retries, \
- .op_flags = _flags, \
- .req_flags = _rq_flags, \
- .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_exec_req(&(struct scsi_exec_args) {
- .sdev = sdev,
- .cmd = cmd,
- .data_dir = data_direction,
- .buf = buffer,
- .buf_len = bufflen,
- .sshdr = sshdr,
- .timeout = timeout,
- .retries = retries,
- .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);
--
2.25.1