From patchwork Mon Jul 23 14:00:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Mack X-Patchwork-Id: 10540359 X-Patchwork-Delegate: sameo@linux.intel.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 567891822 for ; Mon, 23 Jul 2018 14:00:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 47D3C28A78 for ; Mon, 23 Jul 2018 14:00:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 461F128ADE; Mon, 23 Jul 2018 14:00:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC5B428A7A for ; Mon, 23 Jul 2018 14:00:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388134AbeGWPB7 (ORCPT ); Mon, 23 Jul 2018 11:01:59 -0400 Received: from mail.bugwerft.de ([46.23.86.59]:49910 "EHLO mail.bugwerft.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388071AbeGWPB7 (ORCPT ); Mon, 23 Jul 2018 11:01:59 -0400 Received: from localhost.localdomain (i577BC19A.versanet.de [87.123.193.154]) by mail.bugwerft.de (Postfix) with ESMTPSA id 688CB2916AF; Mon, 23 Jul 2018 14:00:11 +0000 (UTC) From: Daniel Mack To: sameo@linux.intel.com Cc: linux-wireless@vger.kernel.org, colin.king@canonical.com, shikha.singh@st.com, Daniel Mack Subject: [PATCH 04/10] NFC: st95hf: remove logging from spi functions Date: Mon, 23 Jul 2018 16:00:09 +0200 Message-Id: <20180723140015.11663-5-daniel@zonque.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180723140015.11663-1-daniel@zonque.org> References: <20180723140015.11663-1-daniel@zonque.org> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The callers of these functions already log errors, so there's no need to do it from two places. Signed-off-by: Daniel Mack --- drivers/nfc/st95hf/spi.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/drivers/nfc/st95hf/spi.c b/drivers/nfc/st95hf/spi.c index e2d3bbcc8c34..d5894d4546b1 100644 --- a/drivers/nfc/st95hf/spi.c +++ b/drivers/nfc/st95hf/spi.c @@ -47,8 +47,6 @@ int st95hf_spi_send(struct st95hf_spi_context *spicontext, result = spi_sync(spidev, &m); if (result) { - dev_err(&spidev->dev, "error: sending cmd to st95hf using SPI = %d\n", - result); mutex_unlock(&spicontext->spi_lock); return result; } @@ -62,12 +60,10 @@ int st95hf_spi_send(struct st95hf_spi_context *spicontext, result = wait_for_completion_timeout(&spicontext->done, msecs_to_jiffies(1000)); /* check for timeout or success */ - if (!result) { - dev_err(&spidev->dev, "error: response not ready timeout\n"); + if (!result) result = -ETIMEDOUT; - } else { + else result = 0; - } mutex_unlock(&spicontext->spi_lock); @@ -79,7 +75,7 @@ EXPORT_SYMBOL_GPL(st95hf_spi_send); int st95hf_spi_recv_response(struct st95hf_spi_context *spicontext, unsigned char *receivebuff) { - int len = 0; + int ret, len; struct spi_transfer tx_takedata; struct spi_message m; struct spi_device *spidev = spicontext->spidev; @@ -89,8 +85,6 @@ int st95hf_spi_recv_response(struct st95hf_spi_context *spicontext, {.rx_buf = receivebuff, .len = 2, .cs_change = 1,}, }; - int ret = 0; - memset(&tx_takedata, 0x0, sizeof(struct spi_transfer)); mutex_lock(&spicontext->spi_lock); @@ -102,8 +96,6 @@ int st95hf_spi_recv_response(struct st95hf_spi_context *spicontext, ret = spi_sync(spidev, &m); if (ret) { - dev_err(&spidev->dev, "spi_recv_resp, data length error = %d\n", - ret); mutex_unlock(&spicontext->spi_lock); return ret; } @@ -127,11 +119,8 @@ int st95hf_spi_recv_response(struct st95hf_spi_context *spicontext, ret = spi_sync(spidev, &m); mutex_unlock(&spicontext->spi_lock); - if (ret) { - dev_err(&spidev->dev, "spi_recv_resp, data read error = %d\n", - ret); + if (ret) return ret; - } return len; }