Skip to content

Commit

Permalink
Staging: hv: vmbus_drv: Get rid of util synchronixation based on chan…
Browse files Browse the repository at this point in the history
…nel counting

Now that we have dealt with this issue differently, get rid of the
old mechanism.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed May 17, 2011
1 parent b9d8e35 commit 02bb4b9
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 20 deletions.
17 changes: 0 additions & 17 deletions drivers/staging/hv/channel_mgmt.c
Original file line number Diff line number Diff line change
Expand Up @@ -327,22 +327,6 @@ void free_channel(struct vmbus_channel *channel)
}


DECLARE_COMPLETION(hv_channel_ready);

/*
* Count initialized channels, and ensure all channels are ready when hv_vmbus
* module loading completes.
*/
static void count_hv_channel(void)
{
static int counter;
unsigned long flags;

spin_lock_irqsave(&vmbus_connection.channel_lock, flags);
if (++counter == MAX_MSG_TYPES)
complete(&hv_channel_ready);
spin_unlock_irqrestore(&vmbus_connection.channel_lock, flags);
}

/*
* vmbus_process_rescind_offer -
Expand Down Expand Up @@ -449,7 +433,6 @@ static void vmbus_process_offer(struct work_struct *work)

pr_info("%s\n", hv_cb_utils[cnt].log_msg);

count_hv_channel();
}
}
}
Expand Down
2 changes: 0 additions & 2 deletions drivers/staging/hv/hyperv.h
Original file line number Diff line number Diff line change
Expand Up @@ -844,8 +844,6 @@ static inline struct hv_driver *drv_to_hv_drv(struct device_driver *d)
int vmbus_child_driver_register(struct device_driver *drv);
void vmbus_child_driver_unregister(struct device_driver *drv);

extern struct completion hv_channel_ready;

/*
* Common header for Hyper-V ICs
*/
Expand Down
1 change: 0 additions & 1 deletion drivers/staging/hv/vmbus_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,6 @@ static int vmbus_bus_init(struct pci_dev *pdev)


vmbus_request_offers();
wait_for_completion(&hv_channel_ready);

cleanup:
return ret;
Expand Down

0 comments on commit 02bb4b9

Please sign in to comment.