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

Commit 8dfd3326 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Greg Kroah-Hartman
Browse files

Drivers: hv: vmbus: unify calls to percpu_channel_enq() 



Remove some code duplication, no functional change intended.

Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1959a28e

drivers/hv/channel_mgmt.c

+18 −33
Original line number Original line Diff line number Diff line
@@ -233,7 +233,6 @@ static void vmbus_process_offer(struct vmbus_channel *newchannel) 
{

{

	struct vmbus_channel *channel;

	struct vmbus_channel *channel;

	bool fnew = true;

	bool fnew = true;

	bool enq = false;

	unsigned long flags;

	unsigned long flags;





	/* Make sure this is a new offer */

	/* Make sure this is a new offer */
@@ -249,25 +248,12 @@ static void vmbus_process_offer(struct vmbus_channel *newchannel) 
		}

		}

	}

	}





	if (fnew) {

	if (fnew)

		list_add_tail(&newchannel->listentry,

		list_add_tail(&newchannel->listentry,

			      &vmbus_connection.chn_list);

			      &vmbus_connection.chn_list);

		enq = true;

	}





	spin_unlock_irqrestore(&vmbus_connection.channel_lock, flags);

	spin_unlock_irqrestore(&vmbus_connection.channel_lock, flags);





	if (enq) {

		if (newchannel->target_cpu != get_cpu()) {

			put_cpu();

			smp_call_function_single(newchannel->target_cpu,

						 percpu_channel_enq,

						 newchannel, true);

		} else {

			percpu_channel_enq(newchannel);

			put_cpu();

		}

	}

	if (!fnew) {

	if (!fnew) {

		/*

		/*

		 * Check to see if this is a sub-channel.

		 * Check to see if this is a sub-channel.
@@ -280,6 +266,10 @@ static void vmbus_process_offer(struct vmbus_channel *newchannel) 
			spin_lock_irqsave(&channel->lock, flags);

			spin_lock_irqsave(&channel->lock, flags);

			list_add_tail(&newchannel->sc_list, &channel->sc_list);

			list_add_tail(&newchannel->sc_list, &channel->sc_list);

			spin_unlock_irqrestore(&channel->lock, flags);

			spin_unlock_irqrestore(&channel->lock, flags);

			channel->num_sc++;

		} else

			goto err_free_chan;

	}





	if (newchannel->target_cpu != get_cpu()) {

	if (newchannel->target_cpu != get_cpu()) {

		put_cpu();

		put_cpu();
@@ -291,17 +281,6 @@ static void vmbus_process_offer(struct vmbus_channel *newchannel) 
		put_cpu();

		put_cpu();

	}

	}





			newchannel->state = CHANNEL_OPEN_STATE;

			channel->num_sc++;

			if (channel->sc_creation_callback != NULL)

				channel->sc_creation_callback(newchannel);



			return;

		}



		goto err_free_chan;

	}



	/*

	/*

	 * This state is used to indicate a successful open

	 * This state is used to indicate a successful open

	 * so that when we do close the channel normally, we

	 * so that when we do close the channel normally, we
@@ -309,6 +288,12 @@ static void vmbus_process_offer(struct vmbus_channel *newchannel) 
	 */

	 */

	newchannel->state = CHANNEL_OPEN_STATE;

	newchannel->state = CHANNEL_OPEN_STATE;





	if (!fnew) {

		if (channel->sc_creation_callback != NULL)

			channel->sc_creation_callback(newchannel);

		return;

	}



	/*

	/*

	 * Start the process of binding this offer to the driver

	 * Start the process of binding this offer to the driver

	 * We need to set the DeviceObject field before calling

	 * We need to set the DeviceObject field before calling