Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-28 07:01:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SCSI] st: convert read_mode_page to use st_scsi_kern_execute

Browse Source 
This replaces st_do_scsi in read_mode_page (MODE_SENSE) with
st_scsi_kern_execute.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Kai Makisara <Kai.Makisara@kolumbus.fi>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
FUJITA Tomonori 2008-12-05 15:25:28 +09:00 committed by James Bottomley
parent 52107b2c57
commit 8ecf0d994a
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/scsi/st.c
View File

@ -2371,7 +2371,8 @@ static int st_set_options(struct scsi_tape *STp, long options)
static int read_mode_page(struct scsi_tape *STp, int page, int omit_block_descs) static int read_mode_page(struct scsi_tape *STp, int page, int omit_block_descs)
{ {
unsigned char cmd[MAX_COMMAND_SIZE]; unsigned char cmd[MAX_COMMAND_SIZE];
struct st_request *SRpnt = NULL; struct st_request *SRpnt;
int ret;
memset(cmd, 0, MAX_COMMAND_SIZE); memset(cmd, 0, MAX_COMMAND_SIZE);
cmd[0] = MODE_SENSE; cmd[0] = MODE_SENSE;
@ -2380,14 +2381,17 @@ static int read_mode_page(struct scsi_tape *STp, int page, int omit_block_descs)
cmd[2] = page; cmd[2] = page;
cmd[4] = 255; cmd[4] = 255;
SRpnt = st_do_scsi(SRpnt, STp, cmd, cmd[4], DMA_FROM_DEVICE, SRpnt = st_allocate_request(STp);
STp->device->request_queue->rq_timeout, 0, 1); if (!SRpnt)
if (SRpnt == NULL) return STp->buffer->syscall_result;
return (STp->buffer)->syscall_result;
ret = st_scsi_kern_execute(SRpnt, cmd, DMA_FROM_DEVICE,
STp->buffer->b_data, cmd[4],
STp->device->request_queue->rq_timeout,
MAX_RETRIES);
st_release_request(SRpnt); st_release_request(SRpnt);
return (STp->buffer)->syscall_result; return ret ? : STp->buffer->syscall_result;
} }