From 40bf63ed45520bef3fa6c91674d71927298cb245 Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Tue, 10 May 2011 07:56:09 -0700 Subject: [PATCH] Staging: hv: Make storvsc_drv an instance of hv_driver In preparation for eliminating struct storvsc_driver, make the variable storvsc_drv an instance of struct hv_driver. Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang Signed-off-by: Abhishek Kane Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/hv/storvsc_drv.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index de6984f..907d855 100644 --- a/drivers/staging/hv/storvsc_drv.c +++ b/drivers/staging/hv/storvsc_drv.c @@ -751,9 +751,9 @@ static int storvsc_probe(struct hv_device *device) /* The one and only one */ -static struct storvsc_driver storvsc_drv = { - .base.probe = storvsc_probe, - .base.remove = storvsc_remove, +static struct hv_driver storvsc_drv = { + .probe = storvsc_probe, + .remove = storvsc_remove, }; @@ -763,7 +763,7 @@ static struct storvsc_driver storvsc_drv = { static int storvsc_drv_init(void) { int ret; - struct hv_driver *drv = &storvsc_drv.base; + struct hv_driver *drv = &storvsc_drv; u32 max_outstanding_req_per_channel; /* @@ -805,7 +805,7 @@ static int storvsc_drv_exit_cb(struct device *dev, void *data) static void storvsc_drv_exit(void) { - struct hv_driver *drv = &storvsc_drv.base; + struct hv_driver *drv = &storvsc_drv; struct device *current_dev = NULL; int ret; -- 2.7.4