January 2018 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH -next] slimbus: qcom: Make some local functions static
by Wei Yongjun 02 Jan '18

02 Jan '18

Fixes the following sparse warnings: drivers/slimbus/qcom-ctrl.c:151:6: warning: symbol 'slim_ack_txn' was not declared. Should it be static? drivers/slimbus/qcom-ctrl.c:304:6: warning: symbol 'slim_alloc_txbuf' was not declared. Should it be static? Signed-off-by: Wei Yongjun <weiyongjun1(a)huawei.com> --- drivers/slimbus/qcom-ctrl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/slimbus/qcom-ctrl.c b/drivers/slimbus/qcom-ctrl.c index 35ad70d..600f62d 100644 --- a/drivers/slimbus/qcom-ctrl.c +++ b/drivers/slimbus/qcom-ctrl.c @@ -148,7 +148,7 @@ static void *slim_alloc_rxbuf(struct qcom_slim_ctrl *ctrl) return ctrl->rx.base + (idx * ctrl->rx.sl_sz); } -void slim_ack_txn(struct qcom_slim_ctrl *ctrl, int err) +static void slim_ack_txn(struct qcom_slim_ctrl *ctrl, int err) { struct completion *comp; unsigned long flags; @@ -301,8 +301,8 @@ static int qcom_clk_pause_wakeup(struct slim_controller *sctrl) return 0; } -void *slim_alloc_txbuf(struct qcom_slim_ctrl *ctrl, struct slim_msg_txn *txn, - struct completion *done) +static void *slim_alloc_txbuf(struct qcom_slim_ctrl *ctrl, + struct slim_msg_txn *txn, struct completion *done) { unsigned long flags; int idx;

1 0

[alsa-devel] [PATCH -next] slimbus: qcom: Fix return value check in qcom_slim_probe()
by Wei Yongjun 02 Jan '18

02 Jan '18

In case of error, the function devm_ioremap_resource() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Fixes: ad7fcbc308b0 ("slimbus: qcom: Add Qualcomm Slimbus controller driver") Signed-off-by: Wei Yongjun <weiyongjun1(a)huawei.com> --- drivers/slimbus/qcom-ctrl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/slimbus/qcom-ctrl.c b/drivers/slimbus/qcom-ctrl.c index 35ad70d..96fefd6 100644 --- a/drivers/slimbus/qcom-ctrl.c +++ b/drivers/slimbus/qcom-ctrl.c @@ -530,9 +530,9 @@ static int qcom_slim_probe(struct platform_device *pdev) slim_mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ctrl"); ctrl->base = devm_ioremap_resource(ctrl->dev, slim_mem); - if (!ctrl->base) { + if (IS_ERR(ctrl->base)) { dev_err(&pdev->dev, "IOremap failed\n"); - return -ENOMEM; + return PTR_ERR(ctrl->base); } sctrl->set_laddr = qcom_set_laddr;

1 0

[alsa-devel] [PATCH -next] slimbus: Fix missing unlock on error in slim_msg_response()
by Wei Yongjun 02 Jan '18

02 Jan '18

Add the missing unlock before return from function slim_msg_response() in the error handling case. Fixes: afbdcc7c384b ("slimbus: Add messaging APIs to slimbus framework") Signed-off-by: Wei Yongjun <weiyongjun1(a)huawei.com> --- drivers/slimbus/messaging.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/slimbus/messaging.c b/drivers/slimbus/messaging.c index 755462a..a1328ac 100644 --- a/drivers/slimbus/messaging.c +++ b/drivers/slimbus/messaging.c @@ -38,6 +38,7 @@ void slim_msg_response(struct slim_controller *ctrl, u8 *reply, u8 tid, u8 len) if (msg == NULL || msg->rbuf == NULL) { dev_err(ctrl->dev, "Got response to invalid TID:%d, len:%d\n", tid, len); + spin_unlock_irqrestore(&ctrl->txn_lock, flags); return; }

1 0

[alsa-devel] [PATCH -next] slimbus: Use GFP_ATOMIC under spin lock
by Wei Yongjun 02 Jan '18

02 Jan '18

A spin lock is taken here so we should use GFP_ATOMIC. Fixes: afbdcc7c384b ("slimbus: Add messaging APIs to slimbus framework") Signed-off-by: Wei Yongjun <weiyongjun1(a)huawei.com> --- drivers/slimbus/messaging.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/slimbus/messaging.c b/drivers/slimbus/messaging.c index 755462a..ef54ea1 100644 --- a/drivers/slimbus/messaging.c +++ b/drivers/slimbus/messaging.c @@ -98,7 +98,7 @@ int slim_do_transfer(struct slim_controller *ctrl, struct slim_msg_txn *txn) if (need_tid) { spin_lock_irqsave(&ctrl->txn_lock, flags); tid = idr_alloc(&ctrl->tid_idr, txn, 0, - SLIM_MAX_TIDS, GFP_KERNEL); + SLIM_MAX_TIDS, GFP_ATOMIC); txn->tid = tid; if (!txn->msg->comp)

1 0