From patchwork Fri Jun 2 05:37:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 9761569 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 48D4F60363 for ; Fri, 2 Jun 2017 05:38:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3B5AD23B23 for ; Fri, 2 Jun 2017 05:38:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3007528498; Fri, 2 Jun 2017 05:38:10 +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=-6.9 required=2.0 tests=BAYES_00,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 1ED6B28423 for ; Fri, 2 Jun 2017 05:38:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751202AbdFBFiI (ORCPT ); Fri, 2 Jun 2017 01:38:08 -0400 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:42657 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751205AbdFBFiH (ORCPT ); Fri, 2 Jun 2017 01:38:07 -0400 Received: from dude.hi.pengutronix.de ([2001:67c:670:100:1d::7]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1dGfHi-0007bK-4B; Fri, 02 Jun 2017 07:38:06 +0200 Received: from sha by dude.hi.pengutronix.de with local (Exim 4.89) (envelope-from ) id 1dGfHh-0001Hh-Cw; Fri, 02 Jun 2017 07:38:05 +0200 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-spi@vger.kernel.org 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 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;