From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751286AbdFBFiV (ORCPT ); Fri, 2 Jun 2017 01:38:21 -0400 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:59599 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751252AbdFBFiT (ORCPT ); Fri, 2 Jun 2017 01:38:19 -0400 From: Sascha Hauer To: linux-spi@vger.kernel.org Cc: Mark Brown , kernel@pengutronix.de, linux-kernel@vger.kernel.org, festevam@gmail.com, Jiada Wang , Sascha Hauer Subject: [PATCH 1/6] spi: imx: Nothing to do in setupxfer when transfer is NULL Date: Fri, 2 Jun 2017 07:37:59 +0200 Message-Id: <20170602053804.3238-2-s.hauer@pengutronix.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170602053804.3238-1-s.hauer@pengutronix.de> References: <20170602053804.3238-1-s.hauer@pengutronix.de> X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::7 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When the spi_transfer given in spi_imx_setupxfer is NULL then we have nothing to do. Bail out early in this case so that we do not have to test for t != NULL multiple times later. Signed-off-by: Sascha Hauer --- drivers/spi/spi-imx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index b402530a7a9a..4b5cd0c84450 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -217,9 +217,6 @@ static bool spi_imx_can_dma(struct spi_master *master, struct spi_device *spi, if (!master->dma_rx) return false; - if (!transfer) - return false; - bpw = transfer->bits_per_word; if (!bpw) bpw = spi->bits_per_word; @@ -895,8 +892,11 @@ static int spi_imx_setupxfer(struct spi_device *spi, struct spi_imx_config config; int ret; - config.bpw = t ? t->bits_per_word : spi->bits_per_word; - config.speed_hz = t ? t->speed_hz : spi->max_speed_hz; + if (!t) + return 0; + + config.bpw = t->bits_per_word; + config.speed_hz = t->speed_hz; if (!config.speed_hz) config.speed_hz = spi->max_speed_hz; -- 2.11.0