From: Stefan Melmuk <stefan.melmuk@gmail.com>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-kernel@vger.kernel.org, Stefan Melmuk <stefan.melmuk@gmail.com>
Subject: [PATCH 6/8] cdrom: fixed prohibited spaces coding style issues
Date: Mon, 22 Feb 2010 13:26:36 +0100 [thread overview]
Message-ID: <1266841598-19662-6-git-send-email-stefan.melmuk@gmail.com> (raw)
In-Reply-To: <1266841598-19662-1-git-send-email-stefan.melmuk@gmail.com>
Removed all prohibited spaces.
Signed-off-by: Stefan Melmuk <stefan.melmuk@gmail.com>
---
drivers/cdrom/cdrom.c | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 0062bf4..dc0abd1 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -315,7 +315,7 @@ static const char *mrw_address_space[] = { "DMA", "GAA" };
#if (ERRLOGMASK != CD_NOTHING)
#define cdinfo(type, fmt, args...) \
- if ((ERRLOGMASK & type) || debug == 1 ) \
+ if ((ERRLOGMASK & type) || debug == 1) \
printk(KERN_INFO "cdrom: " fmt, ## args)
#else
#define cdinfo(type, fmt, args...)
@@ -323,11 +323,11 @@ static const char *mrw_address_space[] = { "DMA", "GAA" };
/* These are used to simplify getting data in from and back to user land */
#define IOCTL_IN(arg, type, in) \
- if (copy_from_user(&(in), (type __user *) (arg), sizeof (in))) \
+ if (copy_from_user(&(in), (type __user *) (arg), sizeof(in))) \
return -EFAULT;
#define IOCTL_OUT(arg, type, out) \
- if (copy_to_user((type __user *) (arg), &(out), sizeof (out))) \
+ if (copy_to_user((type __user *) (arg), &(out), sizeof(out))) \
return -EFAULT;
/* The (cdo->capability & ~cdi->mask & CDC_XXX) construct was used in
@@ -400,7 +400,7 @@ int register_cdrom(struct cdrom_device_info *cdi)
cdrom_sysctl_register();
}
- ENSURE(drive_status, CDC_DRIVE_STATUS );
+ ENSURE(drive_status, CDC_DRIVE_STATUS);
ENSURE(media_changed, CDC_MEDIA_CHANGED);
ENSURE(tray_move, CDC_CLOSE_TRAY | CDC_OPEN_TRAY);
ENSURE(lock_door, CDC_LOCK);
@@ -684,7 +684,7 @@ static int cdrom_get_random_writable(struct cdrom_device_info *cdi,
if (ret)
return ret;
- memcpy(rfd, &buffer[sizeof(struct feature_header)], sizeof (*rfd));
+ memcpy(rfd, &buffer[sizeof(struct feature_header)], sizeof(*rfd));
return 0;
}
@@ -2046,10 +2046,17 @@ static int cdrom_read_block(struct cdrom_device_info *cdi,
/* set the header info returned */
switch (blksize) {
- case CD_FRAMESIZE_RAW0 : cgc->cmd[9] = 0x58; break;
- case CD_FRAMESIZE_RAW1 : cgc->cmd[9] = 0x78; break;
- case CD_FRAMESIZE_RAW : cgc->cmd[9] = 0xf8; break;
- default : cgc->cmd[9] = 0x10;
+ case CD_FRAMESIZE_RAW0:
+ cgc->cmd[9] = 0x58;
+ break;
+ case CD_FRAMESIZE_RAW1:
+ cgc->cmd[9] = 0x78;
+ break;
+ case CD_FRAMESIZE_RAW:
+ cgc->cmd[9] = 0xf8;
+ break;
+ default:
+ cgc->cmd[9] = 0x10;
}
return cdo->generic_packet(cdi, cgc);
--
1.7.0
next prev parent reply other threads:[~2010-02-22 12:27 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-22 12:26 [PATCH 1/8] cdrom: removed trailing whitespaces Stefan Melmuk
2010-02-22 12:26 ` [PATCH 2/8] cdrom: adjoined pointer asterisks to data names Stefan Melmuk
2010-02-22 12:26 ` [PATCH 3/8] cdrom: fixed braces coding style issues Stefan Melmuk
2010-02-22 12:26 ` [PATCH 4/8] cdrom: added some spaces to fix " Stefan Melmuk
2010-02-22 12:26 ` [PATCH 5/8] cdrom: fixed assignment in if condition " Stefan Melmuk
2010-02-22 12:26 ` Stefan Melmuk [this message]
2010-02-22 12:26 ` [PATCH 7/8] cdrom: fixed indentation coding " Stefan Melmuk
2010-02-22 12:26 ` [PATCH 8/8] cdrom: fixed EXPORT_SYMBOL coding style issue Stefan Melmuk
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=1266841598-19662-6-git-send-email-stefan.melmuk@gmail.com \
--to=stefan.melmuk@gmail.com \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®