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 -----BEGIN PGP SIGNATURE----- iQIcBAABAgAGBQJcxt7RAAoJEHwUBw8lI4NH+5sP/1MBIhE8WWZ64W9LNz004cen XNEjMFYunnuRlRLI2/1j/LuFpqAc56GRvNSf9roSGRGtVYGgW0+jmfCuPZfZQKjT YR7frp5LVaqi6qHzFKwiwfSaAe0Tm3RyNbXVhahntH6dOs50ye6F9rLiO6n7OsTb femF5bfi8i6ypH96IFrjcBoyOWcJMNvAaz1kFZsNkq/LTax4cd/W8xvSvPfSqqxr dtwAXmJp2d7Om7DErcr3NtlaxxIxIDNAS80HLPXFb81E/5To1m++yKWSWlT8BPT1 jicpZChsUQlWG8GzXBfsthv2As0oe8eKQYZ3Ox/adlnqrWf0bymsHlDLQ+BSb9T4 v9RuexqZaFegqJSk4MOTD8HDd8i5ZrxMnMEgr0cMn9ZXoUWfijJpsrOQd7nbc7kX DZgJ7HFp6zm2FF9kc7/fgnE4fJ440HWWpcgKZhs4wcK+vE0JdVlvv77149lzfF+e acIW0HM/WfIbvOXNpuWl7Ar2Bjs2om+fEOy90+ejyxZx5s0yGss4ym546UZioMqs 5D3aVm7Bh40JwkIZkTGPB5I5gwHWwI9VgCBI920D799/MLlv4ccqGZ6wVq0l2iTs 0QSvd6/EmSTOfSLRZYPc8lvZQ3agZbz8hK7C9elw/XQPZKw4gAuGC0776MekmIwa lxNwo1eLSCNJpFycAZn/ =00UQ -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
e21107aa6b
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue