diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-30 14:00:44 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-30 14:00:44 +0100 |
| commit | 1563fca2346c31da30324cefe2e59a2afe0f61fa (patch) | |
| tree | 018ed1d1f76bfacbc23bae84991bdb30eb53aed4 | |
| parent | 0fa328796b985930a62aafc4775a1ef8ac8077cc (diff) | |
| parent | bb349fd2d58062c69508414a9080d822b8d096b5 (diff) | |
| download | linux-1563fca2346c31da30324cefe2e59a2afe0f61fa.tar.bz2 | |
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
| -rw-r--r-- | drivers/soundwire/qcom.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index a317bea2d42d..46995bb382eb 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -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; |