This patch solve various issue detected by checkpatch.pl
Signed-off-by: Aurelien BOUIN <[email protected]>
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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
