From patchwork Wed Jan 28 12:23:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Ribalda Delgado X-Patchwork-Id: 5734811 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2B237BF440 for ; Thu, 29 Jan 2015 02:21:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7235A201BB for ; Thu, 29 Jan 2015 02:21:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9EC4C20160 for ; Thu, 29 Jan 2015 02:21:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755365AbbA2CVT (ORCPT ); Wed, 28 Jan 2015 21:21:19 -0500 Received: from mail-lb0-f182.google.com ([209.85.217.182]:57722 "EHLO mail-lb0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933668AbbA2CVO (ORCPT ); Wed, 28 Jan 2015 21:21:14 -0500 Received: by mail-lb0-f182.google.com with SMTP id l4so23357197lbv.13; Wed, 28 Jan 2015 18:21:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HSXTX/hX/JfhLUJxR+VMWqGQnxIvxpSnWVmM573H124=; b=sYxYAHq9Z6JbFF8FcisNy0R1wz68stby6B0KQOLln1crEtSpa52CRS1UEc5lk/5Fi7 44B+B2MtrYO3t+TVKchyeDsoruq4muR6ofXbT0hW+aHUnrjukZEHM31DomcBCxXHNHBR TTSTDsGCDLWkeb5CztX9ks4oR9ZVOr1D8Bh3pq1TIZvwB/FIjKozqs9RsZ+it7qa6O0d bQVUPAp6sBEx5ByoMAPx/Rvap3AaBetvn9J1C8duXpWbemDtK6eejoAg1FjrAJ1PK1ne CNvcfb1NXxegswJT6dQxvNdwVY/6VC3+xlOszCoH4g8alqmNb4o8SIfC3ip8jnWhzbJr Nc/w== X-Received: by 10.152.206.41 with SMTP id ll9mr7667023lac.62.1422447849188; Wed, 28 Jan 2015 04:24:09 -0800 (PST) Received: from neopili.qtec.com (cpe.xe-3-0-1-778.vbrnqe10.dk.customer.tdc.net. [80.197.57.18]) by mx.google.com with ESMTPSA id xh7sm1293741lbb.17.2015.01.28.04.24.07 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 Jan 2015 04:24:08 -0800 (PST) From: Ricardo Ribalda Delgado To: Mark Brown , Michal Simek , =?UTF-8?q?S=C3=B6ren=20Brinkmann?= , linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Ricardo Ribalda Delgado Subject: [PATCH v2 09/15] spi/xilinx: Make spi_tx and spi_rx simmetric Date: Wed, 28 Jan 2015 13:23:48 +0100 Message-Id: <1422447834-23116-10-git-send-email-ricardo.ribalda@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1422447834-23116-1-git-send-email-ricardo.ribalda@gmail.com> References: <1422447834-23116-1-git-send-email-ricardo.ribalda@gmail.com> Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP spi_rx handles the case where the buffer is null. Nevertheless spi_tx did not handle it, and was handled by the caller function. Signed-off-by: Ricardo Ribalda Delgado --- drivers/spi/spi-xilinx.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c index ac94e54..6ce1066 100644 --- a/drivers/spi/spi-xilinx.c +++ b/drivers/spi/spi-xilinx.c @@ -116,6 +116,10 @@ static unsigned int xspi_read32_be(void __iomem *addr) static void xilinx_spi_tx(struct xilinx_spi *xspi) { + if (!xspi->tx_ptr) { + xspi->write_fn(0, xspi->regs + XSPI_TXD_OFFSET); + return; + } xspi->write_fn(*(u32 *)(xspi->tx_ptr), xspi->regs + XSPI_TXD_OFFSET); xspi->tx_ptr += xspi->bits_per_word / 8; } @@ -230,10 +234,7 @@ static void xilinx_spi_fill_tx_fifo(struct xilinx_spi *xspi, int n_words) xspi->remaining_bytes -= n_words * xspi->bits_per_word / 8; while (n_words--) - if (xspi->tx_ptr) - xilinx_spi_tx(xspi); - else - xspi->write_fn(0, xspi->regs + XSPI_TXD_OFFSET); + xilinx_spi_tx(xspi); return; }