From patchwork Tue Apr 17 17:09:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10346065 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2EBEA60216 for ; Tue, 17 Apr 2018 17:11:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 201C01FF65 for ; Tue, 17 Apr 2018 17:11:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 147A0285B5; Tue, 17 Apr 2018 17:11:04 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 783691FF65 for ; Tue, 17 Apr 2018 17:11:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753031AbeDQRKM (ORCPT ); Tue, 17 Apr 2018 13:10:12 -0400 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:35770 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753133AbeDQRJu (ORCPT ); Tue, 17 Apr 2018 13:09:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=j6CW1acu1101volH1YcZeEclCCDRyrtAKEjFyq+nzpU=; b=hLP+Yv76qZMY PwY6K/DeGEPF8LjsbkCwCYIZgQisAfzTYibeL1Zl71cqMXZ8dUyqqSpHPiY/sq6i92SXXXSDMJBaQ DtGBp85y6swV5Zhs7+IDNEA/HhBIYht4uxrSWOyDh61uvlSePLjju6ygkD8SG9dCdtmH79jZ3L30+ Awgvg=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1f8U71-0007uP-3Q; Tue, 17 Apr 2018 17:09:47 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1f8U70-0001kI-L7; Tue, 17 Apr 2018 18:09:46 +0100 From: Mark Brown To: Jarkko Nikula Cc: Mark Brown , linux-spi@vger.kernel.org, Mark Brown , Robert Jarzmik , Haojian Zhuang , Daniel Mack , linux-spi@vger.kernel.org Subject: Applied "spi: pxa2xx: Remove pump_transfers string from dev_ prints" to the spi tree In-Reply-To: <20180417142002.450-2-jarkko.nikula@linux.intel.com> Message-Id: Date: Tue, 17 Apr 2018 18:09:46 +0100 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The patch spi: pxa2xx: Remove pump_transfers string from dev_ prints has been applied to the spi tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From 8ae55af38817a0e0a9bd2987c4e5aa40db4ce5dd Mon Sep 17 00:00:00 2001 From: Jarkko Nikula Date: Tue, 17 Apr 2018 17:20:01 +0300 Subject: [PATCH] spi: pxa2xx: Remove pump_transfers string from dev_ prints We are going to rename and modify pump_transfers(). Prepare for it by removing the string "pump_transfers:" from error and warning prints. While at it make these user-visible strings single line in sources as it helps source grepping from error reports. Signed-off-by: Jarkko Nikula Signed-off-by: Mark Brown --- drivers/spi/spi-pxa2xx.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index f4d4f5123189..e4930542bc4b 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -1029,8 +1029,7 @@ static void pump_transfers(unsigned long data) if (message->is_dma_mapped || transfer->rx_dma || transfer->tx_dma) { dev_err(&drv_data->pdev->dev, - "pump_transfers: mapped transfer length of " - "%u is greater than %d\n", + "Mapped transfer length of %u is greater than %d\n", transfer->len, MAX_DMA_LEN); message->status = -EINVAL; giveback(drv_data); @@ -1039,14 +1038,13 @@ static void pump_transfers(unsigned long data) /* warn ... we force this to PIO mode */ dev_warn_ratelimited(&message->spi->dev, - "pump_transfers: DMA disabled for transfer length %ld " - "greater than %d\n", + "DMA disabled for transfer length %ld greater than %d\n", (long)drv_data->len, MAX_DMA_LEN); } /* Setup the transfer state based on the type of transfer */ if (pxa2xx_spi_flush(drv_data) == 0) { - dev_err(&drv_data->pdev->dev, "pump_transfers: flush failed\n"); + dev_err(&drv_data->pdev->dev, "Flush failed\n"); message->status = -EIO; giveback(drv_data); return; @@ -1095,7 +1093,7 @@ static void pump_transfers(unsigned long data) bits, &dma_burst, &dma_thresh)) dev_warn_ratelimited(&message->spi->dev, - "pump_transfers: DMA burst size reduced to match bits_per_word\n"); + "DMA burst size reduced to match bits_per_word\n"); } message->state = RUNNING_STATE;