p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

soundwire: more alignment fixes 

Found few more issues reported checkpatch on code alignment so fix those
as well in the soundwire core.

Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Vinod Koul 2019-05-02 16:29:24 +05:30 committed by Greg Kroah-Hartman
parent 51ed743734
commit 62f0cec3b0
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/soundwire/bus.c
View File

@ -43,7 +43,8 @@ int sdw_add_bus_master(struct sdw_bus *bus)
if (bus->ops->read_prop) {
ret = bus->ops->read_prop(bus);
if (ret < 0) {
dev_err(bus->dev, "Bus read properties failed:%d\n", ret);
dev_err(bus->dev,
"Bus read properties failed:%d\n", ret);
return ret;
}
}

15
drivers/soundwire/stream.c
View File

@ -400,7 +400,8 @@ static int sdw_do_port_prep(struct sdw_slave_runtime *s_rt,
ret = ops->port_prep(s_rt->slave, &prep_ch, cmd);
if (ret < 0) {
dev_err(&s_rt->slave->dev,
"Slave Port Prep cmd %d failed: %d\n", cmd, ret);
"Slave Port Prep cmd %d failed: %d\n",
cmd, ret);
return ret;
}
}
@ -614,7 +615,8 @@ static int sdw_program_params(struct sdw_bus *bus)
ret = sdw_notify_config(m_rt);
if (ret < 0) {
dev_err(bus->dev, "Notify bus config failed: %d\n", ret);
dev_err(bus->dev,
"Notify bus config failed: %d\n", ret);
return ret;
}
@ -789,7 +791,8 @@ static int do_bank_switch(struct sdw_stream_runtime *stream)
ret = ops->post_bank_switch(bus);
if (ret < 0) {
dev_err(bus->dev,
"Post bank switch op failed: %d\n", ret);
"Post bank switch op failed: %d\n",
ret);
goto error;
}
} else if (bus->multi_link && stream->m_rt_count > 1) {
@ -1562,7 +1565,8 @@ static int _sdw_enable_stream(struct sdw_stream_runtime *stream)
/* Enable port(s) */
ret = sdw_enable_disable_ports(m_rt, true);
if (ret < 0) {
dev_err(bus->dev, "Enable port(s) failed ret: %d\n", ret);
dev_err(bus->dev,
"Enable port(s) failed ret: %d\n", ret);
return ret;
}
}
@ -1672,7 +1676,8 @@ static int _sdw_deprepare_stream(struct sdw_stream_runtime *stream)
/* De-prepare port(s) */
ret = sdw_prep_deprep_ports(m_rt, false);
if (ret < 0) {
dev_err(bus->dev, "De-prepare port(s) failed: %d\n", ret);
dev_err(bus->dev,
"De-prepare port(s) failed: %d\n", ret);
return ret;
}

10
include/linux/soundwire/sdw.h
View File

@ -470,14 +470,14 @@ struct sdw_bus_params {
struct sdw_slave_ops {
int (*read_prop)(struct sdw_slave *sdw);
int (*interrupt_callback)(struct sdw_slave *slave,
struct sdw_slave_intr_status *status);
struct sdw_slave_intr_status *status);
int (*update_status)(struct sdw_slave *slave,
enum sdw_slave_status status);
enum sdw_slave_status status);
int (*bus_config)(struct sdw_slave *slave,
struct sdw_bus_params *params);
struct sdw_bus_params *params);
int (*port_prep)(struct sdw_slave *slave,
struct sdw_prepare_ch *prepare_ch,
enum sdw_port_prep_ops pre_ops);
struct sdw_prepare_ch *prepare_ch,
enum sdw_port_prep_ops pre_ops);
};
/**