Merge remote-tracking branch 'char-misc/char-misc-next'

[deliverable/linux.git] / drivers / misc / mei / mei_dev.h

diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h
index e5e32503d4bc44d9e03283f45910b271ba836a68..397ae2b45c9e62ad548292e13432782a95bb246d 100644 (file)
--- a/drivers/misc/mei/mei_dev.h
+++ b/drivers/misc/mei/mei_dev.h
@@ -80,18 +80,13 @@ const char *mei_dev_state_str(int state);
 enum iamthif_states {
        MEI_IAMTHIF_IDLE,
        MEI_IAMTHIF_WRITING,
-       MEI_IAMTHIF_FLOW_CONTROL,
        MEI_IAMTHIF_READING,
-       MEI_IAMTHIF_READ_COMPLETE
 };
 
 enum mei_file_transaction_states {
        MEI_IDLE,
        MEI_WRITING,
        MEI_WRITE_COMPLETE,
-       MEI_FLOW_CONTROL,
-       MEI_READING,
-       MEI_READ_COMPLETE
 };
 
 /**
@@ -146,7 +141,7 @@ struct mei_fw_status {
  * @refcnt: struct reference count
  * @props: client properties
  * @client_id: me client id
- * @mei_flow_ctrl_creds: flow control credits
+ * @tx_flow_ctrl_creds: flow control credits
  * @connect_count: number connections to this client
  * @bus_added: added to bus
  */
@@ -155,7 +150,7 @@ struct mei_me_client {
        struct kref refcnt;
        struct mei_client_properties props;
        u8 client_id;
-       u8 mei_flow_ctrl_creds;
+       u8 tx_flow_ctrl_creds;
        u8 connect_count;
        u8 bus_added;
 };
@@ -202,10 +197,11 @@ struct mei_cl_cb {
  * @ev_async: event async notification
  * @status: connection status
  * @me_cl: fw client connected
+ * @fp: file associated with client
  * @host_client_id: host id
- * @mei_flow_ctrl_creds: transmit flow credentials
+ * @tx_flow_ctrl_creds: transmit flow credentials
+ * @rx_flow_ctrl_creds: receive flow credentials
  * @timer_count:  watchdog timer for operation completion
- * @reserved: reserved for alignment
  * @notify_en: notification - enabled/disabled
  * @notify_ev: pending notification event
  * @writing_state: state of the tx
@@ -225,10 +221,11 @@ struct mei_cl {
        struct fasync_struct *ev_async;
        int status;
        struct mei_me_client *me_cl;
+       const struct file *fp;
        u8 host_client_id;
-       u8 mei_flow_ctrl_creds;
+       u8 tx_flow_ctrl_creds;
+       u8 rx_flow_ctrl_creds;
        u8 timer_count;
-       u8 reserved;
        u8 notify_en;
        u8 notify_ev;
        enum mei_file_transaction_states writing_state;
@@ -400,9 +397,7 @@ const char *mei_pg_state_str(enum mei_pg_state state);
  * @override_fixed_address: force allow fixed address behavior
  *
  * @amthif_cmd_list : amthif list for cmd waiting
- * @iamthif_fp : file for current amthif operation
  * @iamthif_cl  : amthif host client
- * @iamthif_current_cb : amthif current operation callback
  * @iamthif_open_count : number of opened amthif connections
  * @iamthif_stall_timer : timer to detect amthif hang
  * @iamthif_state : amthif processor state
@@ -484,10 +479,7 @@ struct mei_device {
 
        /* amthif list for cmd waiting */
        struct mei_cl_cb amthif_cmd_list;
-       /* driver managed amthif list for reading completed amthif cmd data */
-       const struct file *iamthif_fp;
        struct mei_cl iamthif_cl;
-       struct mei_cl_cb *iamthif_current_cb;
        long iamthif_open_count;
        u32 iamthif_stall_timer;
        enum iamthif_states iamthif_state;
@@ -569,11 +561,7 @@ void mei_amthif_reset_params(struct mei_device *dev);
 
 int mei_amthif_host_init(struct mei_device *dev, struct mei_me_client *me_cl);
 
-int mei_amthif_read(struct mei_device *dev, struct file *file,
-               char __user *ubuf, size_t length, loff_t *offset);
-
-unsigned int mei_amthif_poll(struct mei_device *dev,
-               struct file *file, poll_table *wait);
+unsigned int mei_amthif_poll(struct file *file, poll_table *wait);
 
 int mei_amthif_release(struct mei_device *dev, struct file *file);