evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[SCSI] sg: remove unnecessary indentation

Browse source 
blocking is de-facto a constant and the now-removed comment wasn't all
that useful either.  Without them and the resulting indentation the code
is a bit nicer to read.

Signed-off-by: Joern Engel <joern@logfs.org>
Acked-by: Douglas Gilbert <dgilbert@interlog.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
Jörn Engel 2012-04-12 17:32:17 -04:00 • committed by James Bottomley
parent a7a20d1039
commit dddbf8d908
1 changed files with 24 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/scsi/sg.c
View file

@ -791,18 +791,14 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
switch (cmd_in) { switch (cmd_in) {
case SG_IO: case SG_IO:
{
int blocking = 1; /* ignore O_NONBLOCK flag */
if (sdp->detached) if (sdp->detached)
return -ENODEV; return -ENODEV;
if (!scsi_block_when_processing_errors(sdp->device)) if (!scsi_block_when_processing_errors(sdp->device))
return -ENXIO; return -ENXIO;
if (!access_ok(VERIFY_WRITE, p, SZ_SG_IO_HDR)) if (!access_ok(VERIFY_WRITE, p, SZ_SG_IO_HDR))
return -EFAULT; return -EFAULT;
result = result = sg_new_write(sfp, filp, p, SZ_SG_IO_HDR,
sg_new_write(sfp, filp, p, SZ_SG_IO_HDR, 1, read_only, 1, &srp);
blocking, read_only, 1, &srp);
if (result < 0) if (result < 0)
return result; return result;
while (1) { while (1) {
@ -824,7 +820,6 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
} }
result = sg_new_read(sfp, p, SZ_SG_IO_HDR, srp); result = sg_new_read(sfp, p, SZ_SG_IO_HDR, srp);
return (result < 0) ? result : 0; return (result < 0) ? result : 0;
}
case SG_SET_TIMEOUT: case SG_SET_TIMEOUT:
result = get_user(val, ip); result = get_user(val, ip);
if (result) if (result)