staging: mei: mei_dev - use type bool instead of int

[~andy/linux] / drivers / staging / mei / mei_dev.h

diff --git a/drivers/staging/mei/mei_dev.h b/drivers/staging/mei/mei_dev.h
index 6f3ec068ed698fe0a0c7ef405b4d4a2b977ccc13..5aae6fd6e2c148420bcb0948bf210ed4286d7c02 100644 (file)
--- a/drivers/staging/mei/mei_dev.h
+++ b/drivers/staging/mei/mei_dev.h
@@ -193,6 +193,7 @@ struct mei_device {
         * list of files
         */
        struct list_head file_list;
+       long open_handle_count;
        /*
         * memory of device
         */
@@ -203,8 +204,8 @@ struct mei_device {
         * lock for the device
         */
        struct mutex device_lock; /* device lock */
-       int recvd_msg;
        struct delayed_work wd_work;    /* watch dog deleye work */
+       bool recvd_msg;
        /*
         * hw states of host and fw(ME)
         */
@@ -222,7 +223,8 @@ struct mei_device {
        enum mei_states mei_state;
        enum mei_init_clients_states init_clients_state;
        u16 init_clients_timer;
-       int stop;
+       bool stop;
+       bool need_reset;
 
        u32 extra_write_index;
        u32 rd_msg_buf[128];    /* used for control messages */
@@ -232,81 +234,86 @@ struct mei_device {
 
        struct hbm_version version;
 
-       int mei_host_buffer_is_empty;
-       struct mei_cl wd_cl;
        struct mei_me_client *me_clients; /* Note: memory has to be allocated */
        DECLARE_BITMAP(me_clients_map, MEI_CLIENTS_MAX);
        DECLARE_BITMAP(host_clients_map, MEI_CLIENTS_MAX);
        u8 num_mei_me_clients;
        u8 me_client_presentation_num;
        u8 me_client_index;
+       bool mei_host_buffer_is_empty;
 
-       int wd_pending;
-       int wd_stopped;
+       struct mei_cl wd_cl;
+       bool wd_pending;
+       bool wd_stopped;
+       bool wd_bypass; /* if false, don't refresh watchdog ME client */
        u16 wd_timeout; /* seconds ((wd_data[1] << 8) + wd_data[0]) */
+       u16 wd_due_counter;
        unsigned char wd_data[MEI_START_WD_DATA_SIZE];
 
 
-       u16 wd_due_counter;
-       bool wd_bypass; /* if false, don't refresh watchdog ME client */
 
        struct file *iamthif_file_object;
        struct mei_cl iamthif_cl;
-       int iamthif_ioctl;
-       int iamthif_canceled;
+       struct mei_cl_cb *iamthif_current_cb;
        int iamthif_mtu;
        unsigned long iamthif_timer;
        u32 iamthif_stall_timer;
        unsigned char *iamthif_msg_buf; /* Note: memory has to be allocated */
        u32 iamthif_msg_buf_size;
        u32 iamthif_msg_buf_index;
-       int iamthif_flow_control_pending;
        enum iamthif_states iamthif_state;
-       struct mei_cl_cb *iamthif_current_cb;
+       bool iamthif_flow_control_pending;
+       bool iamthif_ioctl;
+       bool iamthif_canceled;
        u8 write_hang;
-       int need_reset;
-       long open_handle_count;
-
 };
 
 
 /*
  * mei init function prototypes
  */
-struct mei_device *init_mei_device(struct pci_dev *pdev);
+struct mei_device *mei_device_init(struct pci_dev *pdev);
 void mei_reset(struct mei_device *dev, int interrupts);
 int mei_hw_init(struct mei_device *dev);
 int mei_task_initialize_clients(void *data);
 int mei_initialize_clients(struct mei_device *dev);
-struct mei_cl *mei_alloc_file_private(struct mei_device *dev);
 int mei_disconnect_host_client(struct mei_device *dev, struct mei_cl *cl);
-void mei_initialize_list(struct mei_io_list *list,
-                         struct mei_device *dev);
+void mei_initialize_list(struct mei_io_list *list, struct mei_device *dev);
 void mei_flush_list(struct mei_io_list *list, struct mei_cl *cl);
 void mei_flush_queues(struct mei_device *dev, struct mei_cl *cl);
-void mei_remove_client_from_file_list(struct mei_device *dev,
-                                      u8 host_client_id);
-void host_init_iamthif(struct mei_device *dev);
-void mei_init_file_private(struct mei_cl *priv, struct mei_device *dev);
-void allocate_me_clients_storage(struct mei_device *dev);
+void mei_remove_client_from_file_list(struct mei_device *dev, u8 host_client_id);
+void mei_host_init_iamthif(struct mei_device *dev);
+void mei_allocate_me_clients_storage(struct mei_device *dev);
 
-void host_start_message(struct mei_device *dev);
-void host_enum_clients_message(struct mei_device *dev);
-void host_client_properties(struct mei_device *dev);
 
 u8 mei_find_me_client_update_filext(struct mei_device *dev,
                                struct mei_cl *priv,
                                const uuid_le *cguid, u8 client_id);
 
 /*
- *  interrupt functions prototype
+ * MEI ME Client Functions
+ */
+
+struct mei_cl *mei_cl_allocate(struct mei_device *dev);
+void mei_cl_init(struct mei_cl *priv, struct mei_device *dev);
+
+
+/*
+ * MEI Host Client Functions
+ */
+void mei_host_start_message(struct mei_device *dev);
+void mei_host_enum_clients_message(struct mei_device *dev);
+void mei_host_client_properties(struct mei_device *dev);
+
+/*
+ *  MEI interrupt functions prototype
  */
 irqreturn_t mei_interrupt_quick_handler(int irq, void *dev_id);
-irqreturn_t  mei_interrupt_thread_handler(int irq, void *dev_id);
+irqreturn_t mei_interrupt_thread_handler(int irq, void *dev_id);
 void mei_wd_timer(struct work_struct *work);
 
 /*
- *  input output function prototype
+ *  MEI input output function prototype
  */
 int mei_ioctl_connect_client(struct file *file,
                        struct mei_connect_client_data *data);
@@ -321,7 +328,7 @@ int amthi_read(struct mei_device *dev, struct file *file,
 struct mei_cl_cb *find_amthi_read_list_entry(struct mei_device *dev,
                                                struct file *file);
 
-void run_next_iamthif_cmd(struct mei_device *dev);
+void mei_run_next_iamthif_cmd(struct mei_device *dev);
 
 void mei_free_cb_private(struct mei_cl_cb *priv_cb);
 
@@ -339,8 +346,7 @@ int mei_find_me_client_index(const struct mei_device *dev, uuid_le cuuid);
  *
  * returns the byte read.
  */
-static inline u32 mei_reg_read(struct mei_device *dev,
-                               unsigned long offset)
+static inline u32 mei_reg_read(struct mei_device *dev, unsigned long offset)
 {
        return ioread32(dev->mem_addr + offset);
 }