Merge tag 'lsk-v3.10-15.04-android'

[firefly-linux-kernel-4.4.55.git] / include / linux / mailbox_client.h

diff --git a/include/linux/mailbox_client.h b/include/linux/mailbox_client.h
index 955f3d7641e828e904ae84f35dcb2bbb16594837..307d9cab2026071c98a296611b4e3a52c65f6fc8 100644 (file)
--- a/include/linux/mailbox_client.h
+++ b/include/linux/mailbox_client.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014 Linaro Ltd.
+ * Copyright (C) 2013-2014 Linaro Ltd.
  * Author: Jassi Brar <jassisinghbrar@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -11,36 +11,36 @@
 #define __MAILBOX_CLIENT_H
 
 #include <linux/of.h>
+#include <linux/device.h>
 
 struct mbox_chan;
 
 /**
  * struct mbox_client - User of a mailbox
  * @dev:               The client device
- * @chan_name:         The "controller:channel" this client wants
- * @rx_callback:       Atomic callback to provide client the data received
- * @tx_done:           Atomic callback to tell client of data transmission
  * @tx_block:          If the mbox_send_message should block until data is
  *                     transmitted.
  * @tx_tout:           Max block period in ms before TX is assumed failure
- * @knows_txdone:      if the client could run the TX state machine. Usually
+ * @knows_txdone:      If the client could run the TX state machine. Usually
  *                     if the client receives some ACK packet for transmission.
  *                     Unused if the controller already has TX_Done/RTR IRQ.
+ * @rx_callback:       Atomic callback to provide client the data received
+ * @tx_done:           Atomic callback to tell client of data transmission
  */
 struct mbox_client {
        struct device *dev;
-       const char *chan_name;
-       void (*rx_callback)(struct mbox_client *cl, void *mssg);
-       void (*tx_done)(struct mbox_client *cl, void *mssg, int r);
        bool tx_block;
        unsigned long tx_tout;
        bool knows_txdone;
+
+       void (*rx_callback)(struct mbox_client *cl, void *mssg);
+       void (*tx_done)(struct mbox_client *cl, void *mssg, int r);
 };
 
-struct mbox_chan *mbox_request_channel(struct mbox_client *cl);
+struct mbox_chan *mbox_request_channel(struct mbox_client *cl, int index);
 int mbox_send_message(struct mbox_chan *chan, void *mssg);
-void mbox_client_txdone(struct mbox_chan *chan, int r);
-bool mbox_client_peek_data(struct mbox_chan *chan);
-void mbox_free_channel(struct mbox_chan *chan);
+void mbox_client_txdone(struct mbox_chan *chan, int r); /* atomic */
+bool mbox_client_peek_data(struct mbox_chan *chan); /* atomic */
+void mbox_free_channel(struct mbox_chan *chan); /* may sleep */
 
 #endif /* __MAILBOX_CLIENT_H */