Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-17 18:56:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: most: use braces on all arms of statement

Browse Source 
This patch fixes style issues regarding braces on all arms of a statement.

Signed-off-by: Christian Gromm <christian.gromm@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Christian Gromm 2015-10-21 17:50:44 +02:00 committed by Greg Kroah-Hartman
parent edaa1e33e2
commit 9deba73de5
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/most/hdm-dim2/dim2_hdm.c
View File

@ -202,9 +202,9 @@ static int startup_dim(struct platform_device *pdev)
if (dev->clk_speed == -1) {
pr_info("Bad or missing clock speed parameter, using default value: 3072fs\n");
dev->clk_speed = CLK_3072FS;
} else
} else {
pr_info("Selected clock speed: %s\n", clock_speed);
}
if (pdata && pdata->init) {
int ret = pdata->init(pdata, dev->io_base, dev->clk_speed);

3
drivers/staging/most/hdm-i2c/hdm_i2c.c
View File

@ -268,8 +268,9 @@ static void pending_rx_work(struct work_struct *work)
schedule_delayed_work(&dev->rx.dwork,
msecs_to_jiffies(MSEC_PER_SEC
/ scan_rate));
} else
} else {
enable_irq(dev->client->irq);
}
}
/*

5
drivers/staging/most/hdm-usb/hdm_usb.c
View File

@ -246,10 +246,11 @@ static unsigned int get_stream_frame_size(struct most_channel_config *cfg)
if (cfg->packets_per_xact == 0) {
pr_warn("Misconfig: Packets per XACT zero\n");
frame_size = 0;
} else if (cfg->packets_per_xact == 0xFF)
} else if (cfg->packets_per_xact == 0xFF) {
frame_size = (USB_MTU / sub_size) * sub_size;
else
} else {
frame_size = cfg->packets_per_xact * sub_size;
}
break;
default:
pr_warn("Query frame size of non-streaming channel\n");

16
drivers/staging/most/mostcore/core.c
View File

@ -396,11 +396,11 @@ static ssize_t store_set_direction(struct most_c_obj *c,
const char *buf,
size_t count)
{
if (!strcmp(buf, "dir_rx\n"))
if (!strcmp(buf, "dir_rx\n")) {
c->cfg.direction = MOST_CH_RX;
else if (!strcmp(buf, "dir_tx\n"))
} else if (!strcmp(buf, "dir_tx\n")) {
c->cfg.direction = MOST_CH_TX;
else {
} else {
pr_info("WARN: invalid attribute settings\n");
return -EINVAL;
}
@ -427,15 +427,15 @@ static ssize_t store_set_datatype(struct most_c_obj *c,
const char *buf,
size_t count)
{
if (!strcmp(buf, "control\n"))
if (!strcmp(buf, "control\n")) {
c->cfg.data_type = MOST_CH_CONTROL;
else if (!strcmp(buf, "async\n"))
} else if (!strcmp(buf, "async\n")) {
c->cfg.data_type = MOST_CH_ASYNC;
else if (!strcmp(buf, "sync\n"))
} else if (!strcmp(buf, "sync\n")) {
c->cfg.data_type = MOST_CH_SYNC;
else if (!strcmp(buf, "isoc_avp\n"))
} else if (!strcmp(buf, "isoc_avp\n")) {
c->cfg.data_type = MOST_CH_ISOC_AVP;
else {
} else {
pr_info("WARN: invalid attribute settings\n");
return -EINVAL;
}