aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/mei/interrupt.c
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2012-11-11 10:38:00 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-15 18:34:18 -0500
commit4b8960b492360c115f8214ec116f469338ac2734 (patch)
treebefc4b6ce34c645695ae30e80511702464568606 /drivers/misc/mei/interrupt.c
parentdb3ed43185c6f5d4fd6c5ac963347b849540996e (diff)
mei: rename enum mei_cb_major_types to enum mei_cb_file_ops
1. Rename mei_cb_major_types to more understandable mei_cb_file_ops 2. Rename member struct mei_cl_cb of this type to simple 'fop_type' 3. Add kernel doc for the type Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/interrupt.c')
-rw-r--r--drivers/misc/mei/interrupt.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c
index acc994e3f20b..34e20cc54607 100644
--- a/drivers/misc/mei/interrupt.c
+++ b/drivers/misc/mei/interrupt.c
@@ -57,14 +57,14 @@ irqreturn_t mei_interrupt_quick_handler(int irq, void *dev_id)
57 */ 57 */
58static void _mei_cmpl(struct mei_cl *cl, struct mei_cl_cb *cb_pos) 58static void _mei_cmpl(struct mei_cl *cl, struct mei_cl_cb *cb_pos)
59{ 59{
60 if (cb_pos->major_file_operations == MEI_WRITE) { 60 if (cb_pos->fop_type == MEI_FOP_WRITE) {
61 mei_io_cb_free(cb_pos); 61 mei_io_cb_free(cb_pos);
62 cb_pos = NULL; 62 cb_pos = NULL;
63 cl->writing_state = MEI_WRITE_COMPLETE; 63 cl->writing_state = MEI_WRITE_COMPLETE;
64 if (waitqueue_active(&cl->tx_wait)) 64 if (waitqueue_active(&cl->tx_wait))
65 wake_up_interruptible(&cl->tx_wait); 65 wake_up_interruptible(&cl->tx_wait);
66 66
67 } else if (cb_pos->major_file_operations == MEI_READ && 67 } else if (cb_pos->fop_type == MEI_FOP_READ &&
68 MEI_READING == cl->reading_state) { 68 MEI_READING == cl->reading_state) {
69 cl->reading_state = MEI_READ_COMPLETE; 69 cl->reading_state = MEI_READ_COMPLETE;
70 if (waitqueue_active(&cl->rx_wait)) 70 if (waitqueue_active(&cl->rx_wait))
@@ -268,7 +268,7 @@ static void mei_client_connect_response(struct mei_device *dev,
268 list_del(&pos->list); 268 list_del(&pos->list);
269 return; 269 return;
270 } 270 }
271 if (MEI_IOCTL == pos->major_file_operations) { 271 if (pos->fop_type == MEI_FOP_IOCTL) {
272 if (is_treat_specially_client(cl, rs)) { 272 if (is_treat_specially_client(cl, rs)) {
273 list_del(&pos->list); 273 list_del(&pos->list);
274 cl->status = 0; 274 cl->status = 0;
@@ -988,8 +988,8 @@ static int mei_irq_thread_write_handler(struct mei_cl_cb *cmpl_list,
988 cl->status = 0; 988 cl->status = 0;
989 list_del(&pos->list); 989 list_del(&pos->list);
990 if (MEI_WRITING == cl->writing_state && 990 if (MEI_WRITING == cl->writing_state &&
991 (pos->major_file_operations == MEI_WRITE) && 991 pos->fop_type == MEI_FOP_WRITE &&
992 (cl != &dev->iamthif_cl)) { 992 cl != &dev->iamthif_cl) {
993 dev_dbg(&dev->pdev->dev, "MEI WRITE COMPLETE\n"); 993 dev_dbg(&dev->pdev->dev, "MEI WRITE COMPLETE\n");
994 cl->writing_state = MEI_WRITE_COMPLETE; 994 cl->writing_state = MEI_WRITE_COMPLETE;
995 list_add_tail(&pos->list, &cmpl_list->list); 995 list_add_tail(&pos->list, &cmpl_list->list);
@@ -1044,22 +1044,22 @@ static int mei_irq_thread_write_handler(struct mei_cl_cb *cmpl_list,
1044 list_del(&pos->list); 1044 list_del(&pos->list);
1045 return -ENODEV; 1045 return -ENODEV;
1046 } 1046 }
1047 switch (pos->major_file_operations) { 1047 switch (pos->fop_type) {
1048 case MEI_CLOSE: 1048 case MEI_FOP_CLOSE:
1049 /* send disconnect message */ 1049 /* send disconnect message */
1050 ret = _mei_irq_thread_close(dev, slots, pos, cl, cmpl_list); 1050 ret = _mei_irq_thread_close(dev, slots, pos, cl, cmpl_list);
1051 if (ret) 1051 if (ret)
1052 return ret; 1052 return ret;
1053 1053
1054 break; 1054 break;
1055 case MEI_READ: 1055 case MEI_FOP_READ:
1056 /* send flow control message */ 1056 /* send flow control message */
1057 ret = _mei_irq_thread_read(dev, slots, pos, cl, cmpl_list); 1057 ret = _mei_irq_thread_read(dev, slots, pos, cl, cmpl_list);
1058 if (ret) 1058 if (ret)
1059 return ret; 1059 return ret;
1060 1060
1061 break; 1061 break;
1062 case MEI_IOCTL: 1062 case MEI_FOP_IOCTL:
1063 /* connect message */ 1063 /* connect message */
1064 if (mei_other_client_is_connecting(dev, cl)) 1064 if (mei_other_client_is_connecting(dev, cl))
1065 continue; 1065 continue;