diff options
author | Katja Collier <katjacollier@gmail.com> | 2013-05-17 15:37:06 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-17 15:54:57 -0700 |
commit | 518d752d7b1b03f31caa93c711efcc025e1d53e6 (patch) | |
tree | 4869d318ae002becfde21e8c1fa0cfb97dcbba80 | |
parent | 002c6d57edd0b677a4d9269109323a05d8247b77 (diff) |
staging: fixed else format in ft1000_debug.c
Put else statements on same line as if statement close bracket in
"/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c".
Signed-off-by: Katja Collier <katjacollier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c index 1e01fcac8a35..68a55ce69200 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c @@ -89,8 +89,7 @@ struct dpram_blk *ft1000_get_buffer(struct list_head *bufflist) if (list_empty(bufflist)) { DEBUG("ft1000_get_buffer: No more buffer - %d\n", numofmsgbuf); ptr = NULL; - } - else { + } else { numofmsgbuf--; ptr = list_entry(bufflist->next, struct dpram_blk, list); list_del(&ptr->list); @@ -507,8 +506,7 @@ static long ft1000_ioctl(struct file *file, unsigned int command, ft1000_read_dpram16(ft1000dev, FT1000_MAG_DSP_CON_STATE, (u8 *)&conStat, FT1000_MAG_DSP_CON_STATE_INDX); get_stat_data.ConStat = ntohs(conStat); DEBUG("FT1000:ft1000_ioctl: ConStat = 0x%x\n", get_stat_data.ConStat); - } - else { + } else { get_stat_data.ConStat = 0x0f; } @@ -579,8 +577,7 @@ static long ft1000_ioctl(struct file *file, unsigned int command, if (copy_from_user(dpram_data, argp, msgsz+2)) { DEBUG("FT1000:ft1000_ChIoctl: copy fault occurred\n"); result = -EFAULT; - } - else { + } else { /* Check if this message came from a registered application */ for (i=0; i<MAX_NUM_APP; i++) { if (ft1000dev->app_info[i].fileobject == &file->f_owner) { @@ -599,8 +596,7 @@ static long ft1000_ioctl(struct file *file, unsigned int command, qtype = ntohs(dpram_data->pseudohdr.qos_class) & 0xff; /* DEBUG("FT1000_ft1000_ioctl: qtype = %d\n", qtype); */ if (qtype) { - } - else { + } else { /* Put message into Slow Queue */ /* Only put a message into the DPRAM if msg doorbell is available */ status = ft1000_read_register(ft1000dev, &tempword, FT1000_REG_DOORBELL); @@ -658,14 +654,12 @@ static long ft1000_ioctl(struct file *file, unsigned int command, ft1000dev->app_info[app_index].nTxMsg++; - } - else { + } else { result = -EINVAL; } } } - } - else { + } else { DEBUG("FT1000:ft1000_ioctl: Card not ready take messages\n"); result = -EACCES; } |