Commit 62f0cec3 authored by Vinod Koul's avatar Vinod Koul Committed by Greg Kroah-Hartman

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: default avatarVinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 51ed7437
...@@ -43,7 +43,8 @@ int sdw_add_bus_master(struct sdw_bus *bus) ...@@ -43,7 +43,8 @@ int sdw_add_bus_master(struct sdw_bus *bus)
if (bus->ops->read_prop) { if (bus->ops->read_prop) {
ret = bus->ops->read_prop(bus); ret = bus->ops->read_prop(bus);
if (ret < 0) { 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; return ret;
} }
} }
......
...@@ -400,7 +400,8 @@ static int sdw_do_port_prep(struct sdw_slave_runtime *s_rt, ...@@ -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); ret = ops->port_prep(s_rt->slave, &prep_ch, cmd);
if (ret < 0) { if (ret < 0) {
dev_err(&s_rt->slave->dev, 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; return ret;
} }
} }
...@@ -614,7 +615,8 @@ static int sdw_program_params(struct sdw_bus *bus) ...@@ -614,7 +615,8 @@ static int sdw_program_params(struct sdw_bus *bus)
ret = sdw_notify_config(m_rt); ret = sdw_notify_config(m_rt);
if (ret < 0) { 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; return ret;
} }
...@@ -789,7 +791,8 @@ static int do_bank_switch(struct sdw_stream_runtime *stream) ...@@ -789,7 +791,8 @@ static int do_bank_switch(struct sdw_stream_runtime *stream)
ret = ops->post_bank_switch(bus); ret = ops->post_bank_switch(bus);
if (ret < 0) { if (ret < 0) {
dev_err(bus->dev, dev_err(bus->dev,
"Post bank switch op failed: %d\n", ret); "Post bank switch op failed: %d\n",
ret);
goto error; goto error;
} }
} else if (bus->multi_link && stream->m_rt_count > 1) { } else if (bus->multi_link && stream->m_rt_count > 1) {
...@@ -1562,7 +1565,8 @@ static int _sdw_enable_stream(struct sdw_stream_runtime *stream) ...@@ -1562,7 +1565,8 @@ static int _sdw_enable_stream(struct sdw_stream_runtime *stream)
/* Enable port(s) */ /* Enable port(s) */
ret = sdw_enable_disable_ports(m_rt, true); ret = sdw_enable_disable_ports(m_rt, true);
if (ret < 0) { 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; return ret;
} }
} }
...@@ -1672,7 +1676,8 @@ static int _sdw_deprepare_stream(struct sdw_stream_runtime *stream) ...@@ -1672,7 +1676,8 @@ static int _sdw_deprepare_stream(struct sdw_stream_runtime *stream)
/* De-prepare port(s) */ /* De-prepare port(s) */
ret = sdw_prep_deprep_ports(m_rt, false); ret = sdw_prep_deprep_ports(m_rt, false);
if (ret < 0) { 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; return ret;
} }
......
...@@ -470,14 +470,14 @@ struct sdw_bus_params { ...@@ -470,14 +470,14 @@ struct sdw_bus_params {
struct sdw_slave_ops { struct sdw_slave_ops {
int (*read_prop)(struct sdw_slave *sdw); int (*read_prop)(struct sdw_slave *sdw);
int (*interrupt_callback)(struct sdw_slave *slave, 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, int (*update_status)(struct sdw_slave *slave,
enum sdw_slave_status status); enum sdw_slave_status status);
int (*bus_config)(struct sdw_slave *slave, int (*bus_config)(struct sdw_slave *slave,
struct sdw_bus_params *params); struct sdw_bus_params *params);
int (*port_prep)(struct sdw_slave *slave, int (*port_prep)(struct sdw_slave *slave,
struct sdw_prepare_ch *prepare_ch, struct sdw_prepare_ch *prepare_ch,
enum sdw_port_prep_ops pre_ops); enum sdw_port_prep_ops pre_ops);
}; };
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment