Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-28 23:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

spi: pxa2xx: Move number of CS pins validation out of condition

Browse Source 
There is no need to allocate chip_data and then validate number of
CS pins as it will have the same effect. Hence move number of CS pins
validation out of condition in setup().

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20240403171550.1074644-2-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Andy Shevchenko 2024-04-03 20:06:35 +03:00 committed by Mark Brown
parent 770e3da3fe
commit df3431fd37
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/spi/spi-pxa2xx.c
View File

@ -1197,6 +1197,13 @@ static int setup(struct spi_device *spi)
break;
}
if (drv_data->ssp_type == CE4100_SSP) {
if (spi_get_chipselect(spi, 0) > 4) {
dev_err(&spi->dev, "failed setup: cs number must not be > 4.\n");
return -EINVAL;
}
}
/* Only allocate on the first setup */
chip = spi_get_ctldata(spi);
if (!chip) {
@ -1204,14 +1211,6 @@ static int setup(struct spi_device *spi)
if (!chip)
return -ENOMEM;
if (drv_data->ssp_type == CE4100_SSP) {
if (spi_get_chipselect(spi, 0) > 4) {
dev_err(&spi->dev,
"failed setup: cs number must not be > 4.\n");
kfree(chip);
return -EINVAL;
}
}
chip->enable_dma = drv_data->controller_info->enable_dma;
chip->timeout = TIMOUT_DFLT;
}