diff options
Diffstat (limited to 'include/linux/spi/spi.h')
-rw-r--r-- | include/linux/spi/spi.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h index a6ef2a8e6de4..ed9489d893a4 100644 --- a/include/linux/spi/spi.h +++ b/include/linux/spi/spi.h | |||
@@ -10,10 +10,6 @@ | |||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
12 | * GNU General Public License for more details. | 12 | * GNU General Public License for more details. |
13 | * | ||
14 | * You should have received a copy of the GNU General Public License | ||
15 | * along with this program; if not, write to the Free Software | ||
16 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
17 | */ | 13 | */ |
18 | 14 | ||
19 | #ifndef __LINUX_SPI_H | 15 | #ifndef __LINUX_SPI_H |
@@ -260,6 +256,7 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv) | |||
260 | * @pump_messages: work struct for scheduling work to the message pump | 256 | * @pump_messages: work struct for scheduling work to the message pump |
261 | * @queue_lock: spinlock to syncronise access to message queue | 257 | * @queue_lock: spinlock to syncronise access to message queue |
262 | * @queue: message queue | 258 | * @queue: message queue |
259 | * @idling: the device is entering idle state | ||
263 | * @cur_msg: the currently in-flight message | 260 | * @cur_msg: the currently in-flight message |
264 | * @cur_msg_prepared: spi_prepare_message was called for the currently | 261 | * @cur_msg_prepared: spi_prepare_message was called for the currently |
265 | * in-flight message | 262 | * in-flight message |
@@ -425,6 +422,7 @@ struct spi_master { | |||
425 | spinlock_t queue_lock; | 422 | spinlock_t queue_lock; |
426 | struct list_head queue; | 423 | struct list_head queue; |
427 | struct spi_message *cur_msg; | 424 | struct spi_message *cur_msg; |
425 | bool idling; | ||
428 | bool busy; | 426 | bool busy; |
429 | bool running; | 427 | bool running; |
430 | bool rt; | 428 | bool rt; |