diff --git a/drivers/net/encx24j600.c b/drivers/net/encx24j600.c
index 7cc6791c70..9a94ac005d 100644
--- a/drivers/net/encx24j600.c
+++ b/drivers/net/encx24j600.c
@@ -248,9 +248,7 @@ struct enc_driver_s
   WDOG_ID               txpoll;        /* TX poll timer */
   WDOG_ID               txtimeout;     /* TX timeout timer */
 
-  /* If we don't own the SPI bus, then we cannot do SPI accesses from the
-   * interrupt handler.
-   */
+  /* Avoid SPI accesses from the interrupt handler by using the work queue */
 
   struct work_s         irqwork;       /* Interrupt continuation work queue support */
   struct work_s         towork;        /* Tx timeout work queue support */
diff --git a/drivers/wireless/nrf24l01.c b/drivers/wireless/nrf24l01.c
index 0d83651cee..d1f81ee930 100644
--- a/drivers/wireless/nrf24l01.c
+++ b/drivers/wireless/nrf24l01.c
@@ -1277,7 +1277,7 @@ int nrf24l01_init(FAR struct nrf24l01_dev_s *dev)
   CHECK_ARGS(dev);
   nrf24l01_lock(dev->spi);
 
-  /* Configure the SPI parameters now  (if we own the bus) */
+  /* Configure the SPI parameters before communicating */
 
   nrf24l01_configspi(dev->spi);
 
diff --git a/drivers/wireless/pn532.c b/drivers/wireless/pn532.c
index f0a51be5af..0f171950de 100644
--- a/drivers/wireless/pn532.c
+++ b/drivers/wireless/pn532.c
@@ -154,9 +154,7 @@ static void pn532_unlock(FAR struct spi_dev_s *spi)
 
 static inline void pn532_configspi(FAR struct spi_dev_s *spi)
 {
-  /* Configure SPI for the PN532 module.
-   * As we own the SPI bus this method is called just once.
-   */
+  /* Configure SPI for the PN532 module. */
 
   SPI_SETMODE(spi, SPIDEV_MODE0);
   SPI_SETBITS(spi, -8);
diff --git a/include/nuttx/spi/spi.h b/include/nuttx/spi/spi.h
index ce2aec8655..167da6af4c 100644
--- a/include/nuttx/spi/spi.h
+++ b/include/nuttx/spi/spi.h
@@ -52,13 +52,16 @@
  * Pre-processor Definitions
  ****************************************************************************/
 /* Configuration ************************************************************/
-/* CONFIG_SPI_EXCHANGE - Driver supports a single exchange method
+/* These SPI configuration options affect the form of the SPI interface:
+ *
+ * CONFIG_SPI_EXCHANGE - Driver supports a single exchange method
  *   (vs a recvblock() and sndblock ()methods).
- * CONFIG_SPI_HWFEATURES - Support special, hardware-specific SPI features.
  * CONFIG_SPI_CMDDATA - Devices on the SPI bus require out-of-band support
  *   to distinguish command transfers from data transfers.  Such devices
  *   will often support either 9-bit SPI (yech) or 8-bit SPI and a GPIO
  *   output that selects between command and data.
+ * CONFIG_SPI_HWFEATURES - Include an interface method to support special,
+ *   hardware-specific SPI features.
  */
 
 /* Access macros ************************************************************/