From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751304AbdFBFic (ORCPT ); Fri, 2 Jun 2017 01:38:32 -0400 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:53379 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751176AbdFBFia (ORCPT ); Fri, 2 Jun 2017 01:38:30 -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 5/6] spi: imx: remove bytes_per_word from private driver struct Date: Fri, 2 Jun 2017 07:38:03 +0200 Message-Id: <20170602053804.3238-6-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 We already have bits_per_word in the private driver struct and bytes_per_word can be calculated from it, so remove bits_per_word. Signed-off-by: Sascha Hauer --- drivers/spi/spi-imx.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index 0ec8d816e033..12e5ef7beb0b 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -92,7 +92,6 @@ struct spi_imx_data { unsigned int speed_hz; unsigned int bits_per_word; - unsigned int bytes_per_word; unsigned int spi_drctl; unsigned int count; @@ -215,9 +214,7 @@ static bool spi_imx_can_dma(struct spi_master *master, struct spi_device *spi, if (!master->dma_rx) return false; - bpw = transfer->bits_per_word; - - bpw = spi_imx_bytes_per_word(bpw); + bpw = spi_imx_bytes_per_word(transfer->bits_per_word); if (bpw != 1 && bpw != 2 && bpw != 4) return false; @@ -833,15 +830,14 @@ static irqreturn_t spi_imx_isr(int irq, void *dev_id) return IRQ_HANDLED; } -static int spi_imx_dma_configure(struct spi_master *master, - int bytes_per_word) +static int spi_imx_dma_configure(struct spi_master *master) { int ret; enum dma_slave_buswidth buswidth; struct dma_slave_config rx = {}, tx = {}; struct spi_imx_data *spi_imx = spi_master_get_devdata(master); - switch (bytes_per_word) { + switch (spi_imx_bytes_per_word(spi_imx->bits_per_word)) { case 4: buswidth = DMA_SLAVE_BUSWIDTH_4_BYTES; break; @@ -875,8 +871,6 @@ static int spi_imx_dma_configure(struct spi_master *master, return ret; } - spi_imx->bytes_per_word = bytes_per_word; - return 0; } @@ -910,8 +904,7 @@ static int spi_imx_setupxfer(struct spi_device *spi, spi_imx->usedma = 0; if (spi_imx->usedma) { - ret = spi_imx_dma_configure(spi->master, - spi_imx_bytes_per_word(spi_imx->bits_per_word)); + ret = spi_imx_dma_configure(spi->master); if (ret) return ret; } -- 2.11.0