Skip to contentSkip to conversation

spi: atmel: fix indenting in atmel_spi_gpio_cs()

PATCH In review Dan Carpenter 3 participants 3 messages Nov 14, 2016 – Nov 15, 2016

Subsystems (4)
Kernel janitors SPI Arm/Microchip (AT91) SoC support Microchip SPI driver
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 spi: atmel: fix indenting in atmel_spi_gpio_cs()

These lines were indented one extra tab.

Signed-off-by Dan Carpenter <[email protected]>
drivers/spi/spi-atmel.c +9 -9
index d3affa6..b293149 100644
@@ -1510,15 +1510,15 @@ static int atmel_spi_gpio_cs(struct platform_device *pdev)
 		int cs_gpio = of_get_named_gpio(pdev->dev.of_node,
 						"cs-gpios", i);
 
-			if (cs_gpio = -EPROBE_DEFER)
-				return cs_gpio;
-
-			if (gpio_is_valid(cs_gpio)) {
-				ret = devm_gpio_request(&pdev->dev, cs_gpio,
-							dev_name(&pdev->dev));
-				if (ret)
-					return ret;
-			}
+		if (cs_gpio = -EPROBE_DEFER)
+			return cs_gpio;
+
+		if (gpio_is_valid(cs_gpio)) {
+			ret = devm_gpio_request(&pdev->dev, cs_gpio,
+						dev_name(&pdev->dev));
+			if (ret)
+				return ret;
+		}
 	}
 
 	return 0;
Acked-by on v1 1/1
#1 lore raw
Quoted 3 lines · Dan Carpenter

These lines were indented one extra tab.

Signed-off-by Dan Carpenter <[email protected]>

Oh yes: sorry for that:

Acked-by Nicolas Ferre <[email protected]>

Thanks, Dan. Best regards,

Quoted 30 lines
drivers/spi/spi-atmel.c +9 -9
index d3affa6..b293149 100644
@@ -1510,15 +1510,15 @@ static int atmel_spi_gpio_cs(struct platform_device *pdev)
 		int cs_gpio = of_get_named_gpio(pdev->dev.of_node,
 						"cs-gpios", i);
 
-			if (cs_gpio = -EPROBE_DEFER)
-				return cs_gpio;
-
-			if (gpio_is_valid(cs_gpio)) {
-				ret = devm_gpio_request(&pdev->dev, cs_gpio,
-							dev_name(&pdev->dev));
-				if (ret)
-					return ret;
-			}
+		if (cs_gpio = -EPROBE_DEFER)
+			return cs_gpio;
+
+		if (gpio_is_valid(cs_gpio)) {
+			ret = devm_gpio_request(&pdev->dev, cs_gpio,
+						dev_name(&pdev->dev));
+			if (ret)
+				return ret;
+		}
 	}
 
 	return 0;
Signature · 5 lines
Nicolas Ferre
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
maintainer
#2 lore raw

Applied "spi: atmel: fix indenting in atmel_spi_gpio_cs()" to the spi tree

In reply to Dan Carpenter

The patch

spi: atmel: fix indenting in atmel_spi_gpio_cs()

has been applied to the spi tree at

git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark

From b52b3484eec593a4fe75a68e57f0ade52b55ed8f Mon Sep 17 00:00:00 2001
From: Dan Carpenter <[email protected]>
Date: Mon, 14 Nov 2016 17:26:44 +0300
Subject: [PATCH] spi: atmel: fix indenting in atmel_spi_gpio_cs()

These lines were indented one extra tab.

Signed-off-by Dan Carpenter <[email protected]>
Acked-by Nicolas Ferre <[email protected]>
Signed-off-by Mark Brown <[email protected]>
---
 drivers/spi/spi-atmel.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/spi/spi-atmel.c +9 -9
index d3affa6afe7e..b2931493cab2 100644
@@ -1510,15 +1510,15 @@ static int atmel_spi_gpio_cs(struct platform_device *pdev)
 		int cs_gpio = of_get_named_gpio(pdev->dev.of_node,
 						"cs-gpios", i);
 
-			if (cs_gpio = -EPROBE_DEFER)
-				return cs_gpio;
-
-			if (gpio_is_valid(cs_gpio)) {
-				ret = devm_gpio_request(&pdev->dev, cs_gpio,
-							dev_name(&pdev->dev));
-				if (ret)
-					return ret;
-			}
+		if (cs_gpio = -EPROBE_DEFER)
+			return cs_gpio;
+
+		if (gpio_is_valid(cs_gpio)) {
+			ret = devm_gpio_request(&pdev->dev, cs_gpio,
+						dev_name(&pdev->dev));
+			if (ret)
+				return ret;
+		}
 	}
 
 	return 0;
Signature · 1 line
2.10.2