From 3aa46e12657816f0bcfc6424599109034376d1c4 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 20 Oct 2010 15:57:19 -0700 Subject: [PATCH] --- yaml --- r: 220407 b: refs/heads/master c: 40bc5360d7fe6fae4ec454c1dca90d6cdaa7e448 h: refs/heads/master i: 220405: 80bac5adfaad400eb1e27667095e543f9f54cd6c 220403: 2ccda1c81ea7661c44354c5186075574c9032451 220399: ce30ef0e7c11edee0b75f6a62e48a6c639651a4b v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/channel_interface.c | 1 - trunk/drivers/staging/hv/vmbus_api.h | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0030a7bfd929..588acedbec46 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee00966818584e8dbf7a5c7118c3b3cfebd6be14 +refs/heads/master: 40bc5360d7fe6fae4ec454c1dca90d6cdaa7e448 diff --git a/trunk/drivers/staging/hv/channel_interface.c b/trunk/drivers/staging/hv/channel_interface.c index abd7f7fd52c0..c0d1ac8875c1 100644 --- a/trunk/drivers/staging/hv/channel_interface.c +++ b/trunk/drivers/staging/hv/channel_interface.c @@ -151,5 +151,4 @@ const struct vmbus_channel_interface vmbus_ops = { .RecvPacketRaw = ivmbus_recvpacket_raw, .EstablishGpadl = ivmbus_establish_gpadl, .TeardownGpadl = ivmbus_teardown_gpadl, - .GetInfo = get_channel_info, }; diff --git a/trunk/drivers/staging/hv/vmbus_api.h b/trunk/drivers/staging/hv/vmbus_api.h index 7f3d7dcb96a7..0f79216252de 100644 --- a/trunk/drivers/staging/hv/vmbus_api.h +++ b/trunk/drivers/staging/hv/vmbus_api.h @@ -95,7 +95,6 @@ struct hv_device_info { * @RecvPacketRaw: Receive Raw packet * @EstablishGpadl: Set up GPADL for ringbuffer * @TeardownGpadl: Teardown GPADL for ringbuffer - * @GetInfo: Get info about the channel * * This structure contains function pointer to control vmbus channel * behavior. None of these functions is externally callable, but they @@ -126,7 +125,6 @@ struct vmbus_channel_interface { int (*EstablishGpadl)(struct hv_device *dev, void *buf, u32 buflen, u32 *GpadlHandle); int (*TeardownGpadl)(struct hv_device *device, u32 GpadlHandle); - void (*GetInfo)(struct hv_device *dev, struct hv_device_info *devinfo); }; extern const struct vmbus_channel_interface vmbus_ops;