Merge tag 'tty-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[linux-block.git] / include / linux / serdev.h

diff --git a/include/linux/serdev.h b/include/linux/serdev.h
index 531031a15cdda723d0df620f2584152b9e519c9b..f153b2c7f0cd65610906f15c083643fba54e527f 100644 (file)
--- a/include/linux/serdev.h
+++ b/include/linux/serdev.h
@@ -27,8 +27,10 @@ struct serdev_device;
 
 /**
  * struct serdev_device_ops - Callback operations for a serdev device
- * @receive_buf:       Function called with data received from device.
- * @write_wakeup:      Function called when ready to transmit more data.
+ * @receive_buf:       Function called with data received from device;
+ *                     returns number of bytes accepted; may sleep.
+ * @write_wakeup:      Function called when ready to transmit more data; must
+ *                     not sleep.
  */
 struct serdev_device_ops {
        int (*receive_buf)(struct serdev_device *, const unsigned char *, size_t);