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

Commit 59349bfc authored by Liguang Zhang's avatar Liguang Zhang Committed by Greg Kroah-Hartman
Browse files

ipmi:ssif: make ssif_i2c_send() void 



[ Upstream commit dcd10526ac5a0d6cc94ce60b9acfca458163277b ]

This function actually needs no return value. So remove the unneeded
check and make it void.

Signed-off-by: default avatarLiguang Zhang <zhangliguang@linux.alibaba.com>
Message-Id: <20210301140515.18951-1-zhangliguang@linux.alibaba.com>
Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
Stable-dep-of: 95767ed78a18 ("ipmi:ssif: resend_msg() cannot fail")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5e97dc74

drivers/char/ipmi/ipmi_ssif.c

+20 −61
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ static int ipmi_ssif_thread(void *data) 
	return 0;

}



static int ssif_i2c_send(struct ssif_info *ssif_info,

static void ssif_i2c_send(struct ssif_info *ssif_info,

			ssif_i2c_done handler,

			int read_write, int command,

			unsigned char *data, unsigned int size)
@@ -527,7 +527,6 @@ static int ssif_i2c_send(struct ssif_info *ssif_info, 
	ssif_info->i2c_data = data;

	ssif_info->i2c_size = size;

	complete(&ssif_info->wake_thread);

	return 0;

}
@@ -536,22 +535,12 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result, 


static void start_get(struct ssif_info *ssif_info)

{

	int rv;



	ssif_info->rtc_us_timer = 0;

	ssif_info->multi_pos = 0;



	rv = ssif_i2c_send(ssif_info, msg_done_handler, I2C_SMBUS_READ,

	ssif_i2c_send(ssif_info, msg_done_handler, I2C_SMBUS_READ,

		  SSIF_IPMI_RESPONSE,

		  ssif_info->recv, I2C_SMBUS_BLOCK_DATA);

	if (rv < 0) {

		/* request failed, just return the error. */

		if (ssif_info->ssif_debug & SSIF_DEBUG_MSG)

			dev_dbg(&ssif_info->client->dev,

				"Error from i2c_non_blocking_op(5)\n");



		msg_done_handler(ssif_info, -EIO, NULL, 0);

	}

}



static void retry_timeout(struct timer_list *t)
@@ -625,7 +614,6 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result, 
{

	struct ipmi_smi_msg *msg;

	unsigned long oflags, *flags;

	int rv;



	/*

	 * We are single-threaded here, so no need for a lock until we
@@ -671,16 +659,9 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result, 
		ssif_info->multi_len = len;

		ssif_info->multi_pos = 1;



		rv = ssif_i2c_send(ssif_info, msg_done_handler, I2C_SMBUS_READ,

		ssif_i2c_send(ssif_info, msg_done_handler, I2C_SMBUS_READ,

			 SSIF_IPMI_MULTI_PART_RESPONSE_MIDDLE,

			 ssif_info->recv, I2C_SMBUS_BLOCK_DATA);

		if (rv < 0) {

			if (ssif_info->ssif_debug & SSIF_DEBUG_MSG)

				dev_dbg(&ssif_info->client->dev,

					"Error from i2c_non_blocking_op(1)\n");



			result = -EIO;

		} else

		return;

	} else if (ssif_info->multi_pos) {

		/* Middle of multi-part read.  Start the next transaction. */
@@ -743,18 +724,11 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result, 


			ssif_info->multi_pos++;



			rv = ssif_i2c_send(ssif_info, msg_done_handler,

			ssif_i2c_send(ssif_info, msg_done_handler,

				  I2C_SMBUS_READ,

				  SSIF_IPMI_MULTI_PART_RESPONSE_MIDDLE,

				  ssif_info->recv,

				  I2C_SMBUS_BLOCK_DATA);

			if (rv < 0) {

				if (ssif_info->ssif_debug & SSIF_DEBUG_MSG)

					dev_dbg(&ssif_info->client->dev,

						"Error from ssif_i2c_send\n");



				result = -EIO;

			} else

			return;

		}

	}
@@ -936,8 +910,6 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result, 
static void msg_written_handler(struct ssif_info *ssif_info, int result,

				unsigned char *data, unsigned int len)

{

	int rv;



	/* We are single-threaded here, so no need for a lock. */

	if (result < 0) {

		ssif_info->retries_left--;
@@ -1000,18 +972,9 @@ static void msg_written_handler(struct ssif_info *ssif_info, int result, 
			ssif_info->multi_data = NULL;

		}



		rv = ssif_i2c_send(ssif_info, msg_written_handler,

		ssif_i2c_send(ssif_info, msg_written_handler,

			  I2C_SMBUS_WRITE, cmd,

			  data_to_send, I2C_SMBUS_BLOCK_DATA);

		if (rv < 0) {

			/* request failed, just return the error. */

			ssif_inc_stat(ssif_info, send_errors);



			if (ssif_info->ssif_debug & SSIF_DEBUG_MSG)

				dev_dbg(&ssif_info->client->dev,

					"Error from i2c_non_blocking_op(3)\n");

			msg_done_handler(ssif_info, -EIO, NULL, 0);

		}

	} else {

		/* Ready to request the result. */

		unsigned long oflags, *flags;
@@ -1040,7 +1003,6 @@ static void msg_written_handler(struct ssif_info *ssif_info, int result, 


static int start_resend(struct ssif_info *ssif_info)

{

	int rv;

	int command;



	ssif_info->got_alert = false;
@@ -1062,12 +1024,9 @@ static int start_resend(struct ssif_info *ssif_info) 
		ssif_info->data[0] = ssif_info->data_len;

	}



	rv = ssif_i2c_send(ssif_info, msg_written_handler, I2C_SMBUS_WRITE,

	ssif_i2c_send(ssif_info, msg_written_handler, I2C_SMBUS_WRITE,

		   command, ssif_info->data, I2C_SMBUS_BLOCK_DATA);

	if (rv && (ssif_info->ssif_debug & SSIF_DEBUG_MSG))

		dev_dbg(&ssif_info->client->dev,

			"Error from i2c_non_blocking_op(4)\n");

	return rv;

	return 0;

}



static int start_send(struct ssif_info *ssif_info,