diff options
-rw-r--r-- | include/linux/spi/spi.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index caa4665e3fa2..082006714b85 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h | |||
@@ -36,15 +36,15 @@ extern struct bus_type spi_bus_type; | |||
36 | * @mode: The spi mode defines how data is clocked out and in. | 36 | * @mode: The spi mode defines how data is clocked out and in. |
37 | * This may be changed by the device's driver. | 37 | * This may be changed by the device's driver. |
38 | * @bits_per_word: Data transfers involve one or more words; word sizes | 38 | * @bits_per_word: Data transfers involve one or more words; word sizes |
39 | * like eight or 12 bits are common. In-memory wordsizes are | 39 | * like eight or 12 bits are common. In-memory wordsizes are |
40 | * powers of two bytes (e.g. 20 bit samples use 32 bits). | 40 | * powers of two bytes (e.g. 20 bit samples use 32 bits). |
41 | * This may be changed by the device's driver. | 41 | * This may be changed by the device's driver. |
42 | * The spi_transfer.bits_per_word can override this for each transfer. | 42 | * The spi_transfer.bits_per_word can override this for each transfer. |
43 | * @irq: Negative, or the number passed to request_irq() to receive | 43 | * @irq: Negative, or the number passed to request_irq() to receive |
44 | * interrupts from this device. | 44 | * interrupts from this device. |
45 | * @controller_state: Controller's runtime state | 45 | * @controller_state: Controller's runtime state |
46 | * @controller_data: Board-specific definitions for controller, such as | 46 | * @controller_data: Board-specific definitions for controller, such as |
47 | * FIFO initialization parameters; from board_info.controller_data | 47 | * FIFO initialization parameters; from board_info.controller_data |
48 | * | 48 | * |
49 | * An spi_device is used to interchange data between an SPI slave | 49 | * An spi_device is used to interchange data between an SPI slave |
50 | * (usually a discrete chip) and CPU memory. | 50 | * (usually a discrete chip) and CPU memory. |
@@ -145,13 +145,13 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv) | |||
145 | * struct spi_master - interface to SPI master controller | 145 | * struct spi_master - interface to SPI master controller |
146 | * @cdev: class interface to this driver | 146 | * @cdev: class interface to this driver |
147 | * @bus_num: board-specific (and often SOC-specific) identifier for a | 147 | * @bus_num: board-specific (and often SOC-specific) identifier for a |
148 | * given SPI controller. | 148 | * given SPI controller. |
149 | * @num_chipselect: chipselects are used to distinguish individual | 149 | * @num_chipselect: chipselects are used to distinguish individual |
150 | * SPI slaves, and are numbered from zero to num_chipselects. | 150 | * SPI slaves, and are numbered from zero to num_chipselects. |
151 | * each slave has a chipselect signal, but it's common that not | 151 | * each slave has a chipselect signal, but it's common that not |
152 | * every chipselect is connected to a slave. | 152 | * every chipselect is connected to a slave. |
153 | * @setup: updates the device mode and clocking records used by a | 153 | * @setup: updates the device mode and clocking records used by a |
154 | * device's SPI controller; protocol code may call this. | 154 | * device's SPI controller; protocol code may call this. |
155 | * @transfer: adds a message to the controller's transfer queue. | 155 | * @transfer: adds a message to the controller's transfer queue. |
156 | * @cleanup: frees controller-specific state | 156 | * @cleanup: frees controller-specific state |
157 | * | 157 | * |
@@ -276,8 +276,8 @@ extern struct spi_master *spi_busnum_to_master(u16 busnum); | |||
276 | * for this transfer. If 0 the default (from spi_device) is used. | 276 | * for this transfer. If 0 the default (from spi_device) is used. |
277 | * @cs_change: affects chipselect after this transfer completes | 277 | * @cs_change: affects chipselect after this transfer completes |
278 | * @delay_usecs: microseconds to delay after this transfer before | 278 | * @delay_usecs: microseconds to delay after this transfer before |
279 | * (optionally) changing the chipselect status, then starting | 279 | * (optionally) changing the chipselect status, then starting |
280 | * the next transfer or completing this spi_message. | 280 | * the next transfer or completing this spi_message. |
281 | * @transfer_list: transfers are sequenced through spi_message.transfers | 281 | * @transfer_list: transfers are sequenced through spi_message.transfers |
282 | * | 282 | * |
283 | * SPI transfers always write the same number of bytes as they read. | 283 | * SPI transfers always write the same number of bytes as they read. |
@@ -364,7 +364,7 @@ struct spi_transfer { | |||
364 | * and its transfers, ignore them until its completion callback. | 364 | * and its transfers, ignore them until its completion callback. |
365 | */ | 365 | */ |
366 | struct spi_message { | 366 | struct spi_message { |
367 | struct list_head transfers; | 367 | struct list_head transfers; |
368 | 368 | ||
369 | struct spi_device *spi; | 369 | struct spi_device *spi; |
370 | 370 | ||
@@ -382,7 +382,7 @@ struct spi_message { | |||
382 | */ | 382 | */ |
383 | 383 | ||
384 | /* completion is reported through a callback */ | 384 | /* completion is reported through a callback */ |
385 | void (*complete)(void *context); | 385 | void (*complete)(void *context); |
386 | void *context; | 386 | void *context; |
387 | unsigned actual_length; | 387 | unsigned actual_length; |
388 | int status; | 388 | int status; |