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

Commit 5ceb46e2 authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files

mei: revamp mei_amthif_irq_read_message 



Rename the function to mei_amthif_irq_read_msg
and change parameters order

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9b0d5efc

drivers/misc/mei/amthif.c

+5 −5
Original line number Diff line number Diff line
@@ -505,14 +505,15 @@ int mei_amthif_irq_write_complete(struct mei_device *dev, s32 *slots, 
 * mei_amthif_irq_read_message - read routine after ISR to

 *			handle the read amthif message

 *

 * @complete_list: An instance of our list structure

 * @dev: the device structure

 * @mei_hdr: header of amthif message

 * @complete_list: An instance of our list structure

 *

 * returns 0 on success, <0 on failure.

 */

int mei_amthif_irq_read_message(struct mei_cl_cb *complete_list,

		struct mei_device *dev, struct mei_msg_hdr *mei_hdr)

int mei_amthif_irq_read_msg(struct mei_device *dev,

			    struct mei_msg_hdr *mei_hdr,

			    struct mei_cl_cb *complete_list)

{

	struct mei_cl_cb *cb;

	unsigned char *buffer;
@@ -530,8 +531,7 @@ int mei_amthif_irq_read_message(struct mei_cl_cb *complete_list, 
	if (!mei_hdr->msg_complete)

		return 0;



	dev_dbg(&dev->pdev->dev,

			"amthif_message_buffer_index =%d\n",

	dev_dbg(&dev->pdev->dev, "amthif_message_buffer_index =%d\n",

			mei_hdr->length);



	dev_dbg(&dev->pdev->dev, "completed amthif read.\n ");

drivers/misc/mei/interrupt.c

+1 −1
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ int mei_irq_read_handler(struct mei_device *dev, 


		dev_dbg(&dev->pdev->dev, MEI_HDR_FMT, MEI_HDR_PRM(mei_hdr));



		ret = mei_amthif_irq_read_message(cmpl_list, dev, mei_hdr);

		ret = mei_amthif_irq_read_msg(dev, mei_hdr, cmpl_list);

		if (ret)

			goto end;

	} else {

drivers/misc/mei/mei_dev.h

+9 −0
Original line number Diff line number Diff line
@@ -502,6 +502,15 @@ struct mei_cl_cb *mei_amthif_find_read_list_entry(struct mei_device *dev, 


void mei_amthif_run_next_cmd(struct mei_device *dev);



int mei_amthif_irq_write_complete(struct mei_device *dev, s32 *slots,

			struct mei_cl_cb *cb, struct mei_cl_cb *cmpl_list);



void mei_amthif_complete(struct mei_device *dev, struct mei_cl_cb *cb);

int mei_amthif_irq_read_msg(struct mei_device *dev,

			    struct mei_msg_hdr *mei_hdr,

			    struct mei_cl_cb *complete_list);

int mei_amthif_irq_read(struct mei_device *dev, s32 *slots);



/*

 * NFC functions

 */