summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-clps711x.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2014-03-04 12:59:53 +0800
committerMark Brown <broonie@linaro.org>2014-03-10 11:23:37 +0000
commitfcba212de9bdf1016d981c355df29ab169da8eae (patch)
treeab61ad628cebe33564c86624d12c726d4843e8bd /drivers/spi/spi-clps711x.c
parentbf5c2e27036cffda6e20f445391a4d4e1ccc232e (diff)
downloadlinux-fcba212de9bdf1016d981c355df29ab169da8eae.tar.bz2
spi: clps711x: Provide label argument for devm_gpio_request
The label argument was removed by commit 989847967cd762 spi: clps711x: Use devm_gpio_request(), add it back. This makes it easier to know the gpio usage in /sys/kernel/debug/gpio. Also remove unnecessary gpio_is_valid() checking, devm_gpio_request() returns error if the requested gpio is invalid. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi/spi-clps711x.c')
-rw-r--r--drivers/spi/spi-clps711x.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/spi/spi-clps711x.c b/drivers/spi/spi-clps711x.c
index eda7472ceefa..a5938abacfb0 100644
--- a/drivers/spi/spi-clps711x.c
+++ b/drivers/spi/spi-clps711x.c
@@ -159,14 +159,10 @@ static int spi_clps711x_probe(struct platform_device *pdev)
for (i = 0; i < master->num_chipselect; i++) {
master->cs_gpios[i] = pdata->chipselect[i];
- if (!gpio_is_valid(master->cs_gpios[i])) {
- dev_err(&pdev->dev, "Invalid CS GPIO %i\n", i);
- ret = -EINVAL;
- goto err_out;
- }
- if (devm_gpio_request(&pdev->dev, master->cs_gpios[i], NULL)) {
+ ret = devm_gpio_request(&pdev->dev, master->cs_gpios[i],
+ DRIVER_NAME);
+ if (ret) {
dev_err(&pdev->dev, "Can't get CS GPIO %i\n", i);
- ret = -EINVAL;
goto err_out;
}
}