From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
To: linux-ide@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Borislav Petkov <petkovbb@gmail.com>
Subject: [PATCH 1/2] ide-floppy: remove needless parens
Date: Wed, 6 Aug 2008 18:37:21 +0200 [thread overview]
Message-ID: <200808061837.21240.bzolnier@gmail.com> (raw)
Cc: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
drivers/ide/ide-floppy.c | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
Index: b/drivers/ide/ide-floppy.c
===================================================================
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -738,7 +738,7 @@ static int idefloppy_get_sfrp_bit(ide_dr
return 1;
floppy->srfp = pc.buf[8 + 2] & 0x40;
- return (0);
+ return 0;
}
/*
@@ -866,16 +866,17 @@ static int ide_floppy_get_format_capacit
int __user *argp;
if (get_user(u_array_size, arg))
- return (-EFAULT);
+ return -EFAULT;
if (u_array_size <= 0)
- return (-EINVAL);
+ return -EINVAL;
idefloppy_create_read_capacity_cmd(&pc);
if (idefloppy_queue_pc_tail(drive, &pc)) {
printk(KERN_ERR "ide-floppy: Can't get floppy parameters\n");
- return (-EIO);
+ return -EIO;
}
+
header_len = pc.buf[3];
desc_cnt = header_len / 8; /* capacity descriptor of 8 bytes */
@@ -897,19 +898,22 @@ static int ide_floppy_get_format_capacit
length = be16_to_cpup((__be16 *)&pc.buf[desc_start + 6]);
if (put_user(blocks, argp))
- return(-EFAULT);
+ return -EFAULT;
+
++argp;
if (put_user(length, argp))
- return (-EFAULT);
+ return -EFAULT;
+
++argp;
++u_index;
}
if (put_user(u_index, arg))
- return (-EFAULT);
- return (0);
+ return -EFAULT;
+
+ return 0;
}
/*
@@ -931,7 +935,7 @@ static int idefloppy_get_format_progress
if (floppy->srfp) {
idefloppy_create_request_sense_cmd(&pc);
if (idefloppy_queue_pc_tail(drive, &pc))
- return (-EIO);
+ return -EIO;
if (floppy->sense_key == 2 &&
floppy->asc == 4 &&
@@ -950,10 +954,11 @@ static int idefloppy_get_format_progress
progress_indication = ((stat & ATA_DSC) == 0) ? 0 : 0x10000;
}
+
if (put_user(progress_indication, arg))
- return (-EFAULT);
+ return -EFAULT;
- return (0);
+ return 0;
}
static sector_t idefloppy_capacity(ide_drive_t *drive)
reply other threads:[~2008-08-06 16:43 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200808061837.21240.bzolnier@gmail.com \
--to=bzolnier@gmail.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=petkovbb@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.