soundwire updates for 5.17-rc1

- Remove redundant version number read in qcom driver
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE+vs47OPLdNbVcHzyfBQHDyUjg0cFAmHNkHcACgkQfBQHDyUj
 g0eu2w/6AkEvM0qhM6cTdctjFssm4ygxJsguU7IhRbAnlvOG3kv3YsvE5EG+L/Gb
 S5Pi7JnTZNCzW1+d3GwEfXenw+SlYK5uV8dqTf8U1n6dkpN42dIlMXrDu3D+JK3Z
 zM090gT+PDfevR0T0aFjfz1XzjVuBZ6FY0dLqdD7WxzMxBwQ+ly6Agrzu85MzIPx
 4J4lKL3dS7Tqr8XenwNmJUlpxNvlfMLFQwPJNAEDqmWyb+ja2SudodRvHqY2XH0r
 /IqxBvEBRlHw3ayhxgNnssih2kdQik1Cn4d1RYWAio87PjI8E7RMyjjhXWitMW15
 cMmn/a8kyJ2HhpT8fG8lu9yN5T2R32Q7DBUhXNxIhX0tc+jaYWxqaJtwoNNChri7
 OJjRdMh0vatrwAfuXEamhnNyB2Ci1dqsdnY1DM3RVf/UzKzPcZ+3kN86q3Dm3vme
 L8yXYlZzytk7AdJGGFsLAFI7VH5AbEzsswiGJBSlRzdf4ywxs8wc3cydoMtEOuE5
 ueVtXojhexGhVUfeWAK7XfE98M4SlQz5BvedOgioC5ntfoFsqiZs7ZajCqs1qbDZ
 L9jtzz+9xJyYS3hftwDZEc+WKfl0TX+WgqcdPiIG3yISrKBI/SPYVhe1qoBAyA6U
 5bHa4dxoEPZ/hY/ARieoRZ++JyqKnUivG5D3Tz8qKWdV7dcD0tc=
 =vmnD
 -----END PGP SIGNATURE-----

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

Vinod writes:

soundwire updates for 5.17-rc1

 - Remove redundant version number read in qcom driver

* tag 'soundwire-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire:
  soundwire: qcom: remove redundant version number read
This commit is contained in:
Greg Kroah-Hartman 2021-12-30 14:00:44 +01:00
commit 1563fca234

View File

@ -1156,11 +1156,7 @@ static int qcom_swrm_get_port_config(struct qcom_swrm_ctrl *ctrl)
ret = of_property_read_u8_array(np, "qcom,ports-block-pack-mode",
bp_mode, nports);
if (ret) {
u32 version;
ctrl->reg_read(ctrl, SWRM_COMP_HW_VERSION, &version);
if (version <= 0x01030000)
if (ctrl->version <= 0x01030000)
memset(bp_mode, SWR_INVALID_PARAM, QCOM_SDW_MAX_PORTS);
else
return ret;