Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 441ab50f authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files

staging/mei: code style - cleanup blanks 



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

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c9667bff

drivers/staging/mei/init.c

+2 −4
Original line number Diff line number Diff line
@@ -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");

drivers/staging/mei/iorw.c

+7 −12
Original line number Diff line number Diff line
@@ -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;
@@ -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:
@@ -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;

}

drivers/staging/mei/main.c

+6 −10
Original line number Diff line number Diff line
@@ -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);
@@ -498,9 +497,7 @@ static ssize_t mei_read(struct file *file, char __user *ubuf, 
	/* 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;

	}
@@ -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;

drivers/staging/mei/interface.c

+4 −4

File changed.

Contains only whitespace changes.

drivers/staging/mei/interrupt.c

+4 −4

File changed.

Contains only whitespace changes.