Commit e21107aa authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'soundwire-5.2-rc1' of... 

Merge tag 'soundwire-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire into char-misc-next

Vinod writes:

soundwire updates for v5.2-rc1

This round saw interest from Intel, Linaro and Cadence in
Soundwire. More patches are in pipeline (maybe next cycle)

 - removal of useless initialzation in core
 - couple of header and kcalloc inversion fixes on Intel driver

* tag 'soundwire-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire:
  soundwire: intel: fix implicit header use of module.h/export.h
  soundwire: stream: remove useless initialization of local variable
  soundwire: remove useless initializations
  soundwire: intel: fix inversion in devm_kcalloc parameters
parents c0286f56 4abbd783

drivers/soundwire/bus.c

+0 −2
Original line number Diff line number Diff line
@@ -271,8 +271,6 @@ int sdw_fill_msg(struct sdw_msg *msg, struct sdw_slave *slave, 
	msg->dev_num = dev_num;

	msg->flags = flags;

	msg->buf = buf;

	msg->ssp_sync = false;

	msg->page = false;



	if (addr < SDW_REG_NO_PAGE) { /* no paging area */

		return 0;

drivers/soundwire/intel.c

+3 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 


#include <linux/acpi.h>

#include <linux/delay.h>

#include <linux/module.h>

#include <linux/interrupt.h>

#include <linux/platform_device.h>

#include <sound/pcm_params.h>
@@ -796,8 +797,8 @@ static int intel_prop_read(struct sdw_bus *bus) 


	/* BIOS is not giving some values correctly. So, lets override them */

	bus->prop.num_freq = 1;

	bus->prop.freq = devm_kcalloc(bus->dev, sizeof(*bus->prop.freq),

					bus->prop.num_freq, GFP_KERNEL);

	bus->prop.freq = devm_kcalloc(bus->dev, bus->prop.num_freq,

				      sizeof(*bus->prop.freq), GFP_KERNEL);

	if (!bus->prop.freq)

		return -ENOMEM;

drivers/soundwire/intel_init.c

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 
 */



#include <linux/acpi.h>

#include <linux/export.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/soundwire/sdw_intel.h>

#include "intel.h"

drivers/soundwire/stream.c

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ static int sdw_enable_disable_master_ports(struct sdw_master_runtime *m_rt, 
	struct sdw_transport_params *t_params = &p_rt->transport_params;

	struct sdw_bus *bus = m_rt->bus;

	struct sdw_enable_ch enable_ch;

	int ret = 0;

	int ret;



	enable_ch.port_num = p_rt->num;

	enable_ch.ch_mask = p_rt->ch_mask;

CRA Git | Maintained and supported by SUSTech CRA and CCSE