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 7/8] cdrom: fixed indentation coding style issues
Date: Mon, 22 Feb 2010 13:26:37 +0100 [thread overview]
Message-ID: <1266841598-19662-7-git-send-email-stefan.melmuk@gmail.com> (raw)
In-Reply-To: <1266841598-19662-1-git-send-email-stefan.melmuk@gmail.com>
Fixed all indentation coding style issues
Signed-off-by: Stefan Melmuk <stefan.melmuk@gmail.com>
---
drivers/cdrom/cdrom.c | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index dc0abd1..4d96369 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -315,8 +315,8 @@ static const char *mrw_address_space[] = { "DMA", "GAA" };
#if (ERRLOGMASK != CD_NOTHING)
#define cdinfo(type, fmt, args...) \
- if ((ERRLOGMASK & type) || debug == 1) \
- printk(KERN_INFO "cdrom: " fmt, ## args)
+ if ((ERRLOGMASK & type) || debug == 1) \
+ printk(KERN_INFO "cdrom: " fmt, ## args)
#else
#define cdinfo(type, fmt, args...)
#endif
@@ -387,8 +387,8 @@ static int cdrom_dummy_generic_packet(struct cdrom_device_info *cdi,
int register_cdrom(struct cdrom_device_info *cdi)
{
static char banner_printed;
- struct cdrom_device_ops *cdo = cdi->ops;
- int *change_capability = (int *)&cdo->capability; /* hack */
+ struct cdrom_device_ops *cdo = cdi->ops;
+ int *change_capability = (int *)&cdo->capability; /* hack */
cdinfo(CD_OPEN, "entering register_cdrom\n");
@@ -411,7 +411,7 @@ int register_cdrom(struct cdrom_device_info *cdi)
ENSURE(generic_packet, CDC_GENERIC_PACKET);
cdi->mc_flags = 0;
cdo->n_minors = 0;
- cdi->options = CDO_USE_FFLAGS;
+ cdi->options = CDO_USE_FFLAGS;
if (autoclose == 1 && CDROM_CAN(CDC_CLOSE_TRAY))
cdi->options |= (int) CDO_AUTO_CLOSE;
@@ -917,9 +917,9 @@ static int cdrom_open_write(struct cdrom_device_info *cdi)
ret = cdrom_mrw_open_write(cdi);
else if (CDROM_CAN(CDC_DVD_RAM))
ret = cdrom_dvdram_open_write(cdi);
- else if (CDROM_CAN(CDC_RAM) &&
- !CDROM_CAN(CDC_CD_R|CDC_CD_RW|CDC_DVD|CDC_DVD_R|CDC_MRW|CDC_MO_DRIVE))
- ret = cdrom_ram_open_write(cdi);
+ else if (CDROM_CAN(CDC_RAM) &&
+ !CDROM_CAN(CDC_CD_R|CDC_CD_RW|CDC_DVD|CDC_DVD_R|CDC_MRW|CDC_MO_DRIVE))
+ ret = cdrom_ram_open_write(cdi);
else if (CDROM_CAN(CDC_MO_DRIVE))
ret = mo_open_write(cdi);
else if (!cdrom_is_dvd_rw(cdi))
@@ -1142,7 +1142,7 @@ clean_up_and_return:
static int check_for_audio_disc(struct cdrom_device_info *cdi,
struct cdrom_device_ops *cdo)
{
- int ret;
+ int ret;
tracktype tracks;
cdinfo(CD_OPEN, "entering check_for_audio_disc\n");
if (!(cdi->options & CDO_CHECK_TYPE))
@@ -1185,7 +1185,7 @@ static int check_for_audio_disc(struct cdrom_device_info *cdi,
}
cdrom_count_tracks(cdi, &tracks);
if (tracks.error)
- return(tracks.error);
+ return tracks.error;
if (tracks.audio == 0)
return -EMEDIUMTYPE;
@@ -1376,7 +1376,7 @@ static int cdrom_select_disc(struct cdrom_device_info *cdi, int slot)
if (cdi->use_count > 1 || keeplocked) {
if (slot == CDSL_CURRENT)
- return curslot;
+ return curslot;
else
return -EBUSY;
}
@@ -2447,7 +2447,7 @@ static int cdrom_ioctl_debug(struct cdrom_device_info *cdi,
static int cdrom_ioctl_get_capability(struct cdrom_device_info *cdi)
{
cdinfo(CD_DO_IOCTL, "entering CDROM_GET_CAPABILITY\n");
- return (cdi->ops->capability & ~cdi->mask);
+ return cdi->ops->capability & ~cdi->mask;
}
/*
@@ -3345,7 +3345,7 @@ static int cdrom_get_next_writable(struct cdrom_device_info *cdi, long *next_wri
if (ti_size < 0 || ti_size < offsetof(typeof(ti), track_start))
goto use_last_written;
- /* if this track is blank, try the previous. */
+ /* if this track is blank, try the previous. */
if (ti.blank) {
if (last_track == 1)
goto use_last_written;
@@ -3450,7 +3450,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
}
static int cdrom_sysctl_info(ctl_table *ctl, int write,
- void __user *buffer, size_t *lenp, loff_t *ppos)
+ void __user *buffer, size_t *lenp, loff_t *ppos)
{
int pos;
char *info = cdrom_sysctl_settings.info;
@@ -3584,7 +3584,7 @@ static int cdrom_sysctl_handler(ctl_table *ctl, int write,
cdrom_update_settings();
}
- return ret;
+ return ret;
}
/* Place files in /proc/sys/dev/cdrom */
--
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 ` [PATCH 6/8] cdrom: fixed prohibited spaces coding " Stefan Melmuk
2010-02-22 12:26 ` Stefan Melmuk [this message]
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-7-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®