Commit 1fe74a5e authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Greg Kroah-Hartman
Browse files

soundwire: stream: fix alignment issues 



Use Linux style

Reviewed-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 00910f3c

drivers/soundwire/stream.c

+84 −77
Original line number Diff line number Diff line
@@ -293,7 +293,8 @@ static int sdw_program_port_params(struct sdw_master_runtime *m_rt) 
 */

static int sdw_enable_disable_slave_ports(struct sdw_bus *bus,

					  struct sdw_slave_runtime *s_rt,

				struct sdw_port_runtime *p_rt, bool en)

					  struct sdw_port_runtime *p_rt,

					  bool en)

{

	struct sdw_transport_params *t_params = &p_rt->transport_params;

	u32 addr;
@@ -322,7 +323,8 @@ static int sdw_enable_disable_slave_ports(struct sdw_bus *bus, 
}



static int sdw_enable_disable_master_ports(struct sdw_master_runtime *m_rt,

			struct sdw_port_runtime *p_rt, bool en)

					   struct sdw_port_runtime *p_rt,

					   bool en)

{

	struct sdw_transport_params *t_params = &p_rt->transport_params;

	struct sdw_bus *bus = m_rt->bus;
@@ -336,7 +338,8 @@ static int sdw_enable_disable_master_ports(struct sdw_master_runtime *m_rt, 
	/* Perform Master port channel(s) enable/disable */

	if (bus->port_ops->dpn_port_enable_ch) {

		ret = bus->port_ops->dpn_port_enable_ch(bus,

				&enable_ch, bus->params.next_bank);

							&enable_ch,

							bus->params.next_bank);

		if (ret < 0) {

			dev_err(bus->dev,

				"Master chn_en write failed:%d port:%d",
@@ -387,7 +390,8 @@ static int sdw_enable_disable_ports(struct sdw_master_runtime *m_rt, bool en) 
}



static int sdw_do_port_prep(struct sdw_slave_runtime *s_rt,

		struct sdw_prepare_ch prep_ch, enum sdw_port_prep_ops cmd)

			    struct sdw_prepare_ch prep_ch,

			    enum sdw_port_prep_ops cmd)

{

	const struct sdw_slave_ops *ops = s_rt->slave->ops;

	int ret;
@@ -406,7 +410,8 @@ static int sdw_do_port_prep(struct sdw_slave_runtime *s_rt, 


static int sdw_prep_deprep_slave_ports(struct sdw_bus *bus,

				       struct sdw_slave_runtime *s_rt,

			struct sdw_port_runtime *p_rt, bool prep)

				       struct sdw_port_runtime *p_rt,

				       bool prep)

{

	struct completion *port_ready = NULL;

	struct sdw_dpn_prop *dpn_prop;
@@ -492,7 +497,8 @@ static int sdw_prep_deprep_slave_ports(struct sdw_bus *bus, 
}



static int sdw_prep_deprep_master_ports(struct sdw_master_runtime *m_rt,

				struct sdw_port_runtime *p_rt, bool prep)

					struct sdw_port_runtime *p_rt,

					bool prep)

{

	struct sdw_transport_params *t_params = &p_rt->transport_params;

	struct sdw_bus *bus = m_rt->bus;
@@ -963,8 +969,7 @@ static void sdw_master_port_release(struct sdw_bus *bus, 
{

	struct sdw_port_runtime *p_rt, *_p_rt;



	list_for_each_entry_safe(p_rt, _p_rt,

			&m_rt->port_list, port_node) {

	list_for_each_entry_safe(p_rt, _p_rt, &m_rt->port_list, port_node) {

		list_del(&p_rt->port_node);

		kfree(p_rt);

	}
@@ -1117,7 +1122,8 @@ EXPORT_SYMBOL(sdw_stream_remove_slave); 
 */

static int sdw_config_stream(struct device *dev,

			     struct sdw_stream_runtime *stream,

		struct sdw_stream_config *stream_config, bool is_slave)

			     struct sdw_stream_config *stream_config,

			     bool is_slave)

{

	/*

	 * Update the stream rate, channel and bps based on data
@@ -1162,7 +1168,8 @@ static int sdw_is_valid_port_range(struct device *dev, 
	return 0;

}



static struct sdw_port_runtime *sdw_port_alloc(struct device *dev,

static struct sdw_port_runtime

*sdw_port_alloc(struct device *dev,

		struct sdw_port_config *port_config,

		int port_index)

{