luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fpga: altera-ps-spi: Fix getting of optional confd gpio

Browse Source 
Currently the driver does not handle EPROBE_DEFER for the confd gpio.
Use devm_gpiod_get_optional() instead of devm_gpiod_get() and return
error codes from altera_ps_probe().

Fixes: 5692fae074 ("fpga manager: Add altera-ps-spi driver for Altera FPGAs")
Signed-off-by: Phil Reid <preid@electromag.com.au>
Signed-off-by: Moritz Fischer <mdf@kernel.org>
This commit is contained in:
Phil Reid 2019-07-25 10:48:45 +08:00 committed by Moritz Fischer
parent 5f9e832c13
commit dec43da46f
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/fpga/altera-ps-spi.c
View File

@ -210,7 +210,7 @@ static int altera_ps_write_complete(struct fpga_manager *mgr,
return -EIO; return -EIO;
} }
if (!IS_ERR(conf->confd)) { if (conf->confd) {
if (!gpiod_get_raw_value_cansleep(conf->confd)) { if (!gpiod_get_raw_value_cansleep(conf->confd)) {
dev_err(&mgr->dev, "CONF_DONE is inactive!\n"); dev_err(&mgr->dev, "CONF_DONE is inactive!\n");
return -EIO; return -EIO;
@ -289,10 +289,13 @@ static int altera_ps_probe(struct spi_device *spi)
return PTR_ERR(conf->status); return PTR_ERR(conf->status);
} }
conf->confd = devm_gpiod_get(&spi->dev, "confd", GPIOD_IN); conf->confd = devm_gpiod_get_optional(&spi->dev, "confd", GPIOD_IN);
if (IS_ERR(conf->confd)) { if (IS_ERR(conf->confd)) {
dev_warn(&spi->dev, "Not using confd gpio: %ld\n", dev_err(&spi->dev, "Failed to get confd gpio: %ld\n",
PTR_ERR(conf->confd)); PTR_ERR(conf->confd));
return PTR_ERR(conf->confd);
} else if (!conf->confd) {
dev_warn(&spi->dev, "Not using confd gpio");
} }
/* Register manager with unique name */ /* Register manager with unique name */