Commit b898db92 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soundwire-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire 

Pull soundwire updates from Vinod Koul:

 - Constify sdw_bus and sdw_master_type objects

 - use of rtd helper for better code

 - intel aux device remove redundant assignment

* tag 'soundwire-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire:
  soundwire: Use snd_soc_substream_to_rtd() to obtain rtd
  soundwire: constify the struct device_type usage
  soundwire: bus_type: make sdw_bus_type const
  soundwire: intel_auxdevice: remove redundant assignment to variable link_flags
  soundwire: stream: add missing const to Documentation
parents c77756d3 e17aae16

Documentation/driver-api/soundwire/stream.rst

+2 −2
Original line number Diff line number Diff line
@@ -324,12 +324,12 @@ framework, this stream state is linked to .hw_params() operation. 


  int sdw_stream_add_master(struct sdw_bus * bus,

		struct sdw_stream_config * stream_config,

		struct sdw_ports_config * ports_config,

		const struct sdw_ports_config * ports_config,

		struct sdw_stream_runtime * stream);



  int sdw_stream_add_slave(struct sdw_slave * slave,

		struct sdw_stream_config * stream_config,

		struct sdw_ports_config * ports_config,

		const struct sdw_ports_config * ports_config,

		struct sdw_stream_runtime * stream);

drivers/soundwire/bus_type.c

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ int sdw_slave_uevent(const struct device *dev, struct kobj_uevent_env *env) 
	return 0;

}



struct bus_type sdw_bus_type = {

const struct bus_type sdw_bus_type = {

	.name = "soundwire",

	.match = sdw_bus_match,

};

drivers/soundwire/intel_auxdevice.c

+0 −2
Original line number Diff line number Diff line
@@ -621,8 +621,6 @@ static int __maybe_unused intel_resume(struct device *dev) 
		return 0;

	}



	link_flags = md_flags >> (bus->link_id * 8);



	if (pm_runtime_suspended(dev)) {

		dev_dbg(dev, "pm_runtime status was suspended, forcing active\n");

drivers/soundwire/master.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static const struct dev_pm_ops master_dev_pm = { 
			   pm_generic_runtime_resume, NULL)

};



struct device_type sdw_master_type = {

const struct device_type sdw_master_type = {

	.name =		"soundwire_master",

	.release =	sdw_master_device_release,

	.pm = &master_dev_pm,

drivers/soundwire/slave.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ static void sdw_slave_release(struct device *dev) 
	kfree(slave);

}



struct device_type sdw_slave_type = {

const struct device_type sdw_slave_type = {

	.name =		"sdw_slave",

	.release =	sdw_slave_release,

	.uevent =	sdw_slave_uevent,