projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
hv
/
channel_mgmt.c
diff --git
a/drivers/hv/channel_mgmt.c
b/drivers/hv/channel_mgmt.c
index 2b8b8d4558d247c808a0a8f7f6bfd51601aa31a2..2f84c5cff8d4f95a026a42034eb1fac960ec6e6a 100644
(file)
--- a/
drivers/hv/channel_mgmt.c
+++ b/
drivers/hv/channel_mgmt.c
@@
-265,14
+265,9
@@
static void vmbus_onoffer(struct vmbus_channel_message_header *hdr)
{
struct vmbus_channel_offer_channel *offer;
struct vmbus_channel *newchannel;
{
struct vmbus_channel_offer_channel *offer;
struct vmbus_channel *newchannel;
- uuid_le *guidtype;
- uuid_le *guidinstance;
offer = (struct vmbus_channel_offer_channel *)hdr;
offer = (struct vmbus_channel_offer_channel *)hdr;
- guidtype = &offer->offer.if_type;
- guidinstance = &offer->offer.if_instance;
-
/* Allocate the channel object and save this offer. */
newchannel = alloc_channel();
if (!newchannel) {
/* Allocate the channel object and save this offer. */
newchannel = alloc_channel();
if (!newchannel) {
@@
-470,7
+465,6
@@
static void vmbus_onversion_response(
{
struct vmbus_channel_msginfo *msginfo;
struct vmbus_channel_message_header *requestheader;
{
struct vmbus_channel_msginfo *msginfo;
struct vmbus_channel_message_header *requestheader;
- struct vmbus_channel_initiate_contact *initiate;
struct vmbus_channel_version_response *version_response;
unsigned long flags;
struct vmbus_channel_version_response *version_response;
unsigned long flags;
@@
-484,8
+478,6
@@
static void vmbus_onversion_response(
if (requestheader->msgtype ==
CHANNELMSG_INITIATE_CONTACT) {
if (requestheader->msgtype ==
CHANNELMSG_INITIATE_CONTACT) {
- initiate =
- (struct vmbus_channel_initiate_contact *)requestheader;
memcpy(&msginfo->response.version_response,
version_response,
sizeof(struct vmbus_channel_version_response));
memcpy(&msginfo->response.version_response,
version_response,
sizeof(struct vmbus_channel_version_response));