staging/mei: code style - cleanup blanks

1. Remove redundant blanks
2. Straighten code lines that don't go over 80 characters

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/mei/init.c b/drivers/staging/mei/init.c
index 2bb224fb0956f3a9288e6defa73e22283be0e20c..4ac3696883cb51db76319c7bac8b6ef2c90cc164 100644 (file)
--- a/drivers/staging/mei/init.c
+++ b/drivers/staging/mei/init.c
@@ -366,8 +366,7 @@ void mei_host_start_message(struct mei_device *dev)
        host_start_req->host_version.major_version = HBM_MAJOR_VERSION;
        host_start_req->host_version.minor_version = HBM_MINOR_VERSION;
        dev->recvd_msg = false;
-       if (!mei_write_message(dev, mei_hdr,
-                                      (unsigned char *) (host_start_req),
+       if (!mei_write_message(dev, mei_hdr, (unsigned char *)host_start_req,
                                       mei_hdr->length)) {
                dev_dbg(&dev->pdev->dev, "write send version message to FW fail.\n");
                dev->mei_state = MEI_RESETING;
@@ -400,8 +399,7 @@ void mei_host_enum_clients_message(struct mei_device *dev)
        host_enum_req = (struct hbm_host_enum_request *) &dev->wr_msg_buf[1];
        memset(host_enum_req, 0, sizeof(struct hbm_host_enum_request));
        host_enum_req->cmd.cmd = HOST_ENUM_REQ_CMD;
-       if (!mei_write_message(dev, mei_hdr,
-                              (unsigned char *) (host_enum_req),
+       if (!mei_write_message(dev, mei_hdr, (unsigned char *)host_enum_req,
                                mei_hdr->length)) {
                dev->mei_state = MEI_RESETING;
                dev_dbg(&dev->pdev->dev, "write send enumeration request message to FW fail.\n");

diff --git a/drivers/staging/mei/interface.c b/drivers/staging/mei/interface.c
index a65dacf002131f3fd82f737a2f26d01a13877cee..eb5df7fc22691b25d0072ebd08869a8eecc3f5b3 100644 (file)
--- a/drivers/staging/mei/interface.c
+++ b/drivers/staging/mei/interface.c
@@ -128,9 +128,9 @@ int mei_count_empty_write_slots(struct mei_device *dev)
  * returns 1 if success, 0 - otherwise.
  */
 int mei_write_message(struct mei_device *dev,
-                            struct mei_msg_hdr *header,
-                            unsigned char *write_buffer,
-                            unsigned long write_length)
+                     struct mei_msg_hdr *header,
+                     unsigned char *write_buffer,
+                     unsigned long write_length)
 {
        u32 temp_msg = 0;
        unsigned long bytes_written = 0;
@@ -216,7 +216,7 @@ int mei_count_full_read_slots(struct mei_device *dev)
  * @buffer_length: message size will be read
  */
 void mei_read_slots(struct mei_device *dev,
-                    unsigned char *buffer, unsigned long buffer_length)
+                   unsigned char *buffer, unsigned long buffer_length)
 {
        u32 i = 0;
        unsigned char temp_buf[sizeof(u32)];

diff --git a/drivers/staging/mei/interrupt.c b/drivers/staging/mei/interrupt.c
index ad944b2c1da1fecd12b6ebe21045d36784e5cbad..c7822c9d2676a6c49ade5dd0f914041af9e207b8 100644 (file)
--- a/drivers/staging/mei/interrupt.c
+++ b/drivers/staging/mei/interrupt.c
@@ -709,7 +709,7 @@ static void mei_irq_thread_read_bus_message(struct mei_device *dev,
        case CLIENT_DISCONNECT_RES_CMD:
                disconnect_res =
                        (struct hbm_client_connect_response *) mei_msg;
-               mei_client_disconnect_response(dev,      disconnect_res);
+               mei_client_disconnect_response(dev, disconnect_res);
                dev_dbg(&dev->pdev->dev, "client disconnect response message received.\n");
                wake_up(&dev->wait_recvd_msg);
                break;
@@ -727,7 +727,7 @@ static void mei_irq_thread_read_bus_message(struct mei_device *dev,
                        mei_reset(dev, 1);
                        return;
                }
-              if (dev->me_clients[dev->me_client_presentation_num]
+               if (dev->me_clients[dev->me_client_presentation_num]
                                        .client_id == props_res->address) {
 
                        dev->me_clients[dev->me_client_presentation_num].props
@@ -1495,8 +1495,8 @@ void mei_timer(struct work_struct *work)
                }
        }
 out:
-        schedule_delayed_work(&dev->timer_work, 2 * HZ);
-        mutex_unlock(&dev->device_lock);
+       schedule_delayed_work(&dev->timer_work, 2 * HZ);
+       mutex_unlock(&dev->device_lock);
 }
 
 /**

diff --git a/drivers/staging/mei/iorw.c b/drivers/staging/mei/iorw.c
index 841092b13ca12a72c4b19394b6aff39cfa837143..0752ead4269a164e82e7cead44ac1e90b124c1ba 100644 (file)
--- a/drivers/staging/mei/iorw.c
+++ b/drivers/staging/mei/iorw.c
@@ -259,7 +259,7 @@ struct mei_cl_cb *find_amthi_read_list_entry(
  *  negative on failure.
  */
 int amthi_read(struct mei_device *dev, struct file *file,
-             char __user *ubuf, size_t length, loff_t *offset)
+              char __user *ubuf, size_t length, loff_t *offset)
 {
        int rets;
        int wait_ret;
@@ -331,8 +331,7 @@ int amthi_read(struct mei_device *dev, struct file *file,
                }
        }
        /* if the whole message will fit remove it from the list */
-       if (cb->information >= *offset &&
-           length >= (cb->information - *offset))
+       if (cb->information >= *offset && length >= (cb->information - *offset))
                list_del(&cb->cb_list);
        else if (cb->information > 0 && cb->information <= *offset) {
                /* end of the message has been reached */
@@ -353,9 +352,7 @@ int amthi_read(struct mei_device *dev, struct file *file,
         * the information may be longer */
        length = min_t(size_t, length, (cb->information - *offset));
 
-       if (copy_to_user(ubuf,
-                        cb->response_buffer.data + *offset,
-                        length))
+       if (copy_to_user(ubuf, cb->response_buffer.data + *offset, length))
                rets = -EFAULT;
        else {
                rets = length;
@@ -424,7 +421,7 @@ int mei_start_read(struct mei_device *dev, struct mei_cl *cl)
 
        cb->response_buffer.size = dev->me_clients[i].props.max_msg_length;
        cb->response_buffer.data =
-           kmalloc(cb->response_buffer.size, GFP_KERNEL);
+                       kmalloc(cb->response_buffer.size, GFP_KERNEL);
        if (!cb->response_buffer.data) {
                rets = -ENOMEM;
                goto unlock;
@@ -445,8 +442,7 @@ int mei_start_read(struct mei_device *dev, struct mei_cl *cl)
                                      &dev->read_list.mei_cb.cb_list);
                }
        } else {
-               list_add_tail(&cb->cb_list,
-                             &dev->ctrl_wr_list.mei_cb.cb_list);
+               list_add_tail(&cb->cb_list, &dev->ctrl_wr_list.mei_cb.cb_list);
        }
        return rets;
 unlock:
@@ -479,7 +475,7 @@ int amthi_write(struct mei_device *dev, struct mei_cl_cb *cb)
        dev->iamthif_ioctl = true;
        dev->iamthif_msg_buf_size = cb->request_buffer.size;
        memcpy(dev->iamthif_msg_buf, cb->request_buffer.data,
-           cb->request_buffer.size);
+              cb->request_buffer.size);
 
        ret = mei_flow_ctrl_creds(dev, &dev->iamthif_cl);
        if (ret < 0)
@@ -531,8 +527,7 @@ int amthi_write(struct mei_device *dev, struct mei_cl_cb *cb)
 
                dev_dbg(&dev->pdev->dev, "No flow control credentials, "
                                "so add iamthif cb to write list.\n");
-               list_add_tail(&cb->cb_list,
-                             &dev->write_list.mei_cb.cb_list);
+               list_add_tail(&cb->cb_list, &dev->write_list.mei_cb.cb_list);
        }
        return 0;
 }

diff --git a/drivers/staging/mei/main.c b/drivers/staging/mei/main.c
index cb216af63bb6457fadbce7f02e07e52cc1640522..5d84d6c530a97153ede5ddcaf2d0c7d8cc38b3d9 100644 (file)
--- a/drivers/staging/mei/main.c
+++ b/drivers/staging/mei/main.c
@@ -317,8 +317,7 @@ static int mei_release(struct inode *inode, struct file *file)
                    cl->me_client_id);
 
                if (dev->open_handle_count > 0) {
-                       clear_bit(cl->host_client_id,
-                                 dev->host_clients_map);
+                       clear_bit(cl->host_client_id, dev->host_clients_map);
                        dev->open_handle_count--;
                }
                mei_remove_client_from_file_list(dev, cl->host_client_id);
@@ -379,7 +378,7 @@ static int mei_release(struct inode *inode, struct file *file)
  * returns >=0 data length on success , <0 on error
  */
 static ssize_t mei_read(struct file *file, char __user *ubuf,
-                        size_t length, loff_t *offset)
+                       size_t length, loff_t *offset)
 {
        struct mei_cl *cl = file->private_data;
        struct mei_cl_cb *cb_pos = NULL;
@@ -498,9 +497,7 @@ copy_buffer:
        /* information size may be longer */
        length = min_t(size_t, length, (cb->information - *offset));
 
-       if (copy_to_user(ubuf,
-                        cb->response_buffer.data + *offset,
-                        length)) {
+       if (copy_to_user(ubuf, cb->response_buffer.data + *offset, length)) {
                rets = -EFAULT;
                goto free;
        }
@@ -536,7 +533,7 @@ out:
  * returns >=0 data length on success , <0 on error
  */
 static ssize_t mei_write(struct file *file, const char __user *ubuf,
-                         size_t length, loff_t *offset)
+                        size_t length, loff_t *offset)
 {
        struct mei_cl *cl = file->private_data;
        struct mei_cl_cb *write_cb = NULL;
@@ -587,8 +584,7 @@ static ssize_t mei_write(struct file *file, const char __user *ubuf,
                        cl->read_cb = NULL;
                        cl->read_pending = 0;
                }
-       } else if (cl->reading_state == MEI_IDLE &&
-                  !cl->read_pending)
+       } else if (cl->reading_state == MEI_IDLE && !cl->read_pending)
                *offset = 0;
 
 
@@ -859,7 +855,7 @@ out:
  */
 #ifdef CONFIG_COMPAT
 static long mei_compat_ioctl(struct file *file,
-                     unsigned int cmd, unsigned long data)
+                       unsigned int cmd, unsigned long data)
 {
        return mei_ioctl(file, cmd, (unsigned long)compat_ptr(data));
 }