Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932299AbbBLMIn (ORCPT ); Thu, 12 Feb 2015 07:08:43 -0500 Received: from mail-wi0-f177.google.com ([209.85.212.177]:53320 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755370AbbBLMH5 (ORCPT ); Thu, 12 Feb 2015 07:07:57 -0500 From: Aurelien BOUIN To: broonie@kernel.org Cc: festevam@gmail.com, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Aurelien BOUIN Subject: [PATCH 2/4] spi: imx: checkpatch cleanup Date: Thu, 12 Feb 2015 13:07:26 +0100 Message-Id: <1423742848-15369-2-git-send-email-a.bouin@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1423742848-15369-1-git-send-email-a.bouin@gmail.com> References: <1423742848-15369-1-git-send-email-a.bouin@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1893 Lines: 54 This patch solve various issue detected by checkpatch.pl Signed-off-by: Aurelien BOUIN diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index fe1b769..f8400b2 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -282,7 +282,8 @@ static unsigned int mx51_ecspi_clkdiv(unsigned int fin, unsigned int fspi, (post << MX51_ECSPI_CTRL_POSTDIV_OFFSET); } -static void __maybe_unused mx51_ecspi_intctrl(struct spi_imx_data *spi_imx, int enable) +static void __maybe_unused mx51_ecspi_intctrl(struct spi_imx_data *spi_imx, + int enable) { unsigned val = 0; @@ -426,7 +427,8 @@ static void __maybe_unused mx51_ecspi_reset(struct spi_imx_data *spi_imx) * the i.MX35 has a slightly different register layout for bits * we do not use here. */ -static void __maybe_unused mx31_intctrl(struct spi_imx_data *spi_imx, int enable) +static void __maybe_unused mx31_intctrl(struct spi_imx_data *spi_imx, + int enable) { unsigned int val = 0; @@ -504,7 +506,8 @@ static void __maybe_unused mx31_reset(struct spi_imx_data *spi_imx) #define MX21_CSPICTRL_DR_SHIFT 14 #define MX21_CSPICTRL_CS_SHIFT 19 -static void __maybe_unused mx21_intctrl(struct spi_imx_data *spi_imx, int enable) +static void __maybe_unused mx21_intctrl(struct spi_imx_data *spi_imx, + int enable) { unsigned int val = 0; @@ -1111,6 +1114,7 @@ static int spi_imx_probe(struct platform_device *pdev) for (i = 0; i < master->num_chipselect; i++) { int cs_gpio = of_get_named_gpio(np, "cs-gpios", i); + if (!gpio_is_valid(cs_gpio) && mxc_platform_info) cs_gpio = mxc_platform_info->chipselect[i]; -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/