Commit df3431fd authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mark Brown

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

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20240403171550.1074644-2-andriy.shevchenko@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 770e3da3
...@@ -1197,6 +1197,13 @@ static int setup(struct spi_device *spi) ...@@ -1197,6 +1197,13 @@ static int setup(struct spi_device *spi)
break; 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 */ /* Only allocate on the first setup */
chip = spi_get_ctldata(spi); chip = spi_get_ctldata(spi);
if (!chip) { if (!chip) {
...@@ -1204,14 +1211,6 @@ static int setup(struct spi_device *spi) ...@@ -1204,14 +1211,6 @@ static int setup(struct spi_device *spi)
if (!chip) if (!chip)
return -ENOMEM; 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->enable_dma = drv_data->controller_info->enable_dma;
chip->timeout = TIMOUT_DFLT; chip->timeout = TIMOUT_DFLT;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment