openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Katja Collier 2013-05-17 15:37:06 +02:00 committed by Greg Kroah-Hartman
parent 002c6d57ed
commit 518d752d7b
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
View File

@ -89,8 +89,7 @@ struct dpram_blk *ft1000_get_buffer(struct list_head *bufflist)
if (list_empty(bufflist)) { if (list_empty(bufflist)) {
DEBUG("ft1000_get_buffer: No more buffer - %d\n", numofmsgbuf); DEBUG("ft1000_get_buffer: No more buffer - %d\n", numofmsgbuf);
ptr = NULL; ptr = NULL;
} } else {
else {
numofmsgbuf--; numofmsgbuf--;
ptr = list_entry(bufflist->next, struct dpram_blk, list); ptr = list_entry(bufflist->next, struct dpram_blk, list);
list_del(&ptr->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); ft1000_read_dpram16(ft1000dev, FT1000_MAG_DSP_CON_STATE, (u8 *)&conStat, FT1000_MAG_DSP_CON_STATE_INDX);
get_stat_data.ConStat = ntohs(conStat); get_stat_data.ConStat = ntohs(conStat);
DEBUG("FT1000:ft1000_ioctl: ConStat = 0x%x\n", get_stat_data.ConStat); DEBUG("FT1000:ft1000_ioctl: ConStat = 0x%x\n", get_stat_data.ConStat);
} } else {
else {
get_stat_data.ConStat = 0x0f; 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)) { if (copy_from_user(dpram_data, argp, msgsz+2)) {
DEBUG("FT1000:ft1000_ChIoctl: copy fault occurred\n"); DEBUG("FT1000:ft1000_ChIoctl: copy fault occurred\n");
result = -EFAULT; result = -EFAULT;
} } else {
else {
/* Check if this message came from a registered application */ /* Check if this message came from a registered application */
for (i=0; i<MAX_NUM_APP; i++) { for (i=0; i<MAX_NUM_APP; i++) {
if (ft1000dev->app_info[i].fileobject == &file->f_owner) { 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; qtype = ntohs(dpram_data->pseudohdr.qos_class) & 0xff;
/* DEBUG("FT1000_ft1000_ioctl: qtype = %d\n", qtype); */ /* DEBUG("FT1000_ft1000_ioctl: qtype = %d\n", qtype); */
if (qtype) { if (qtype) {
} } else {
else {
/* Put message into Slow Queue */ /* Put message into Slow Queue */
/* Only put a message into the DPRAM if msg doorbell is available */ /* Only put a message into the DPRAM if msg doorbell is available */
status = ft1000_read_register(ft1000dev, &tempword, FT1000_REG_DOORBELL); 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++; ft1000dev->app_info[app_index].nTxMsg++;
} } else {
else {
result = -EINVAL; result = -EINVAL;
} }
} }
} }
} } else {
else {
DEBUG("FT1000:ft1000_ioctl: Card not ready take messages\n"); DEBUG("FT1000:ft1000_ioctl: Card not ready take messages\n");
result = -EACCES; result = -EACCES;
} }