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

Commit 89fb3fa8 authored by Corey Minyard's avatar Corey Minyard Committed by Greg Kroah-Hartman
Browse files

ipmi:ssif: Remove rtc_us_timer 



[ Upstream commit 9e8b89926fb87e5625bdde6fd5de2c31fb1d83bf ]

It was cruft left over from older handling of run to completion.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d1a7f56b

drivers/char/ipmi/ipmi_ssif.c

+0 −9
Original line number Diff line number Diff line
@@ -248,12 +248,6 @@ struct ssif_info { 
	 */

	bool                req_flags;



	/*

	 * Used to perform timer operations when run-to-completion

	 * mode is on.  This is a countdown timer.

	 */

	int                 rtc_us_timer;



	/* Used for sending/receiving data.  +1 for the length. */

	unsigned char data[IPMI_MAX_MSG_LENGTH + 1];

	unsigned int  data_len;
@@ -535,7 +529,6 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result, 


static void start_get(struct ssif_info *ssif_info)

{

	ssif_info->rtc_us_timer = 0;

	ssif_info->multi_pos = 0;



	ssif_i2c_send(ssif_info, msg_done_handler, I2C_SMBUS_READ,
@@ -627,7 +620,6 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result, 


			flags = ipmi_ssif_lock_cond(ssif_info, &oflags);

			ssif_info->waiting_alert = true;

			ssif_info->rtc_us_timer = SSIF_MSG_USEC;

			if (!ssif_info->stopping)

				mod_timer(&ssif_info->retry_timer,

					  jiffies + SSIF_MSG_JIFFIES);
@@ -978,7 +970,6 @@ static void msg_written_handler(struct ssif_info *ssif_info, int result, 
			/* Wait a jiffie then request the next message */

			ssif_info->waiting_alert = true;

			ssif_info->retries_left = SSIF_RECV_RETRIES;

			ssif_info->rtc_us_timer = SSIF_MSG_PART_USEC;

			if (!ssif_info->stopping)

				mod_timer(&ssif_info->retry_timer,

					  jiffies + SSIF_MSG_PART_JIFFIES);