spi: Initialize cs_gpio and cs_gpios with -ENOENT
The return value from of_get_named_gpio is -ENOENT when the given index matches a hole in the "cs-gpios" property phandle list. However, the default value of cs_gpio in struct spi_device and entries of cs_gpios in struct spi_master is -EINVAL, which is documented to indicate that a GPIO line should not be used for the given spi_device. This sets the default value of cs_gpio in struct spi_device and entries of cs_gpios in struct spi_master to -ENOENT. Thus, -ENOENT is the only value used to indicate that no GPIO line should be used. Signed-off-by: Andreas Larsson <andreas@gaisler.com> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
parent
3d3522604a
commit
446411e18b
|
@ -334,7 +334,7 @@ struct spi_device *spi_alloc_device(struct spi_master *master)
|
|||
spi->dev.parent = &master->dev;
|
||||
spi->dev.bus = &spi_bus_type;
|
||||
spi->dev.release = spidev_release;
|
||||
spi->cs_gpio = -EINVAL;
|
||||
spi->cs_gpio = -ENOENT;
|
||||
device_initialize(&spi->dev);
|
||||
return spi;
|
||||
}
|
||||
|
@ -1079,7 +1079,7 @@ static int of_spi_register_master(struct spi_master *master)
|
|||
return -ENOMEM;
|
||||
|
||||
for (i = 0; i < master->num_chipselect; i++)
|
||||
cs[i] = -EINVAL;
|
||||
cs[i] = -ENOENT;
|
||||
|
||||
for (i = 0; i < nb; i++)
|
||||
cs[i] = of_get_named_gpio(np, "cs-gpios", i);
|
||||
|
|
|
@ -57,7 +57,7 @@ extern struct bus_type spi_bus_type;
|
|||
* @modalias: Name of the driver to use with this device, or an alias
|
||||
* for that name. This appears in the sysfs "modalias" attribute
|
||||
* for driver coldplugging, and in uevents used for hotplugging
|
||||
* @cs_gpio: gpio number of the chipselect line (optional, -EINVAL when
|
||||
* @cs_gpio: gpio number of the chipselect line (optional, -ENOENT when
|
||||
* when not using a GPIO line)
|
||||
*
|
||||
* A @spi_device is used to interchange data between an SPI slave
|
||||
|
@ -261,7 +261,7 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv)
|
|||
* queue so the subsystem notifies the driver that it may relax the
|
||||
* hardware by issuing this call
|
||||
* @cs_gpios: Array of GPIOs to use as chip select lines; one per CS
|
||||
* number. Any individual value may be -EINVAL for CS lines that
|
||||
* number. Any individual value may be -ENOENT for CS lines that
|
||||
* are not GPIOs (driven by the SPI controller itself).
|
||||
*
|
||||
* Each SPI master controller can communicate with one or more @spi_device
|
||||
|
|
Loading…
Reference in a new issue