diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2022-03-23 09:58:40 +0100 | 
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2022-03-23 09:58:40 +0100 | 
| commit | b690490d6d466972ade172ee2e7f6ffa49e7e910 (patch) | |
| tree | 50a93da28c9128e19eb7a3038aecf75dab6b36e1 /drivers/fpga/altera-ps-spi.c | |
| parent | f97ec5d75e9261a5da78dc28a8955b7cc0c4468b (diff) | |
| parent | 0f203948230720e849ad50d158adac1cd32c282f (diff) | |
Merge branch 'for-5.18/amd-sfh' into for-linus
- dead code elimination (Christophe JAILLET)
Diffstat (limited to 'drivers/fpga/altera-ps-spi.c')
| -rw-r--r-- | drivers/fpga/altera-ps-spi.c | 9 | 
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/fpga/altera-ps-spi.c b/drivers/fpga/altera-ps-spi.c index 23bfd4d1ad0f..5e1e009dba89 100644 --- a/drivers/fpga/altera-ps-spi.c +++ b/drivers/fpga/altera-ps-spi.c @@ -302,12 +302,9 @@ static int altera_ps_probe(struct spi_device *spi)  	snprintf(conf->mgr_name, sizeof(conf->mgr_name), "%s %s",  		 dev_driver_string(&spi->dev), dev_name(&spi->dev)); -	mgr = devm_fpga_mgr_create(&spi->dev, conf->mgr_name, -				   &altera_ps_ops, conf); -	if (!mgr) -		return -ENOMEM; - -	return devm_fpga_mgr_register(&spi->dev, mgr); +	mgr = devm_fpga_mgr_register(&spi->dev, conf->mgr_name, +				     &altera_ps_ops, conf); +	return PTR_ERR_OR_ZERO(mgr);  }  static const struct spi_device_id altera_ps_spi_ids[] = {  | 
