Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

Staging: hv: storvsc_drv: Rename struct host_device_context

Browse source 
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>
This commit is contained in:
K. Y. Srinivasan 2011-05-10 07:54:19 -07:00 committed by Greg Kroah-Hartman
parent 0f0cdc6af6
commit 972621c965
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
drivers/staging/hv/storvsc_drv.c
View file

@ -17,6 +17,7 @@
* Authors: * Authors:
* Haiyang Zhang <haiyangz@microsoft.com> * Haiyang Zhang <haiyangz@microsoft.com>
* Hank Janssen <hjanssen@microsoft.com> * Hank Janssen <hjanssen@microsoft.com>
* K. Y. Srinivasan <kys@microsoft.com>
*/ */
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
@ -50,7 +51,7 @@ static const struct hv_guid gStorVscDeviceType = {
} }
}; };
struct host_device_context { struct hv_host_device {
/* must be 1st field /* must be 1st field
* FIXME this is a bug */ * FIXME this is a bug */
/* point back to our device context */ /* point back to our device context */
@ -325,14 +326,14 @@ static int storvsc_probe(struct hv_device *device)
struct storvsc_driver *storvsc_drv_obj = struct storvsc_driver *storvsc_drv_obj =
drv_to_stordrv(device->device.driver); drv_to_stordrv(device->device.driver);
struct Scsi_Host *host; struct Scsi_Host *host;
struct host_device_context *host_device_ctx; struct hv_host_device *host_device_ctx;
struct storvsc_device_info device_info; struct storvsc_device_info device_info;
if (!storvsc_drv_obj->base.dev_add) if (!storvsc_drv_obj->base.dev_add)
return -1; return -1;
host = scsi_host_alloc(&scsi_driver, host = scsi_host_alloc(&scsi_driver,
sizeof(struct host_device_context)); sizeof(struct hv_host_device));
if (!host) { if (!host) {
DPRINT_ERR(STORVSC_DRV, "unable to allocate scsi host object"); DPRINT_ERR(STORVSC_DRV, "unable to allocate scsi host object");
return -ENOMEM; return -ENOMEM;
@ -340,8 +341,8 @@ static int storvsc_probe(struct hv_device *device)
dev_set_drvdata(&device->device, host); dev_set_drvdata(&device->device, host);
host_device_ctx = (struct host_device_context *)host->hostdata; host_device_ctx = (struct hv_host_device *)host->hostdata;
memset(host_device_ctx, 0, sizeof(struct host_device_context)); memset(host_device_ctx, 0, sizeof(struct hv_host_device));
host_device_ctx->port = host->host_no; host_device_ctx->port = host->host_no;
host_device_ctx->device_ctx = device; host_device_ctx->device_ctx = device;
@ -402,8 +403,8 @@ static int storvsc_remove(struct hv_device *dev)
struct storvsc_driver *storvsc_drv_obj = struct storvsc_driver *storvsc_drv_obj =
drv_to_stordrv(dev->device.driver); drv_to_stordrv(dev->device.driver);
struct Scsi_Host *host = dev_get_drvdata(&dev->device); struct Scsi_Host *host = dev_get_drvdata(&dev->device);
struct host_device_context *host_device_ctx = struct hv_host_device *host_device_ctx =
(struct host_device_context *)host->hostdata; (struct hv_host_device *)host->hostdata;
/* /*
* Call to the vsc driver to let it know that the device is being * Call to the vsc driver to let it know that the device is being
@ -432,8 +433,8 @@ static void storvsc_commmand_completion(struct hv_storvsc_request *request)
struct storvsc_cmd_request *cmd_request = struct storvsc_cmd_request *cmd_request =
(struct storvsc_cmd_request *)request->context; (struct storvsc_cmd_request *)request->context;
struct scsi_cmnd *scmnd = cmd_request->cmd; struct scsi_cmnd *scmnd = cmd_request->cmd;
struct host_device_context *host_device_ctx = struct hv_host_device *host_device_ctx =
(struct host_device_context *)scmnd->device->host->hostdata; (struct hv_host_device *)scmnd->device->host->hostdata;
void (*scsi_done_fn)(struct scsi_cmnd *); void (*scsi_done_fn)(struct scsi_cmnd *);
struct scsi_sense_hdr sense_hdr; struct scsi_sense_hdr sense_hdr;
struct vmscsi_request *vm_srb; struct vmscsi_request *vm_srb;
@ -682,8 +683,8 @@ static int storvsc_queuecommand_lck(struct scsi_cmnd *scmnd,
void (*done)(struct scsi_cmnd *)) void (*done)(struct scsi_cmnd *))
{ {
int ret; int ret;
struct host_device_context *host_device_ctx = struct hv_host_device *host_device_ctx =
(struct host_device_context *)scmnd->device->host->hostdata; (struct hv_host_device *)scmnd->device->host->hostdata;
struct hv_device *device_ctx = host_device_ctx->device_ctx; struct hv_device *device_ctx = host_device_ctx->device_ctx;
struct storvsc_driver *storvsc_drv_obj = struct storvsc_driver *storvsc_drv_obj =
drv_to_stordrv(device_ctx->device.driver); drv_to_stordrv(device_ctx->device.driver);
@ -915,8 +916,8 @@ static int storvsc_device_configure(struct scsi_device *sdevice)
static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd) static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd)
{ {
int ret; int ret;
struct host_device_context *host_device_ctx = struct hv_host_device *host_device_ctx =
(struct host_device_context *)scmnd->device->host->hostdata; (struct hv_host_device *)scmnd->device->host->hostdata;
struct hv_device *device_ctx = host_device_ctx->device_ctx; struct hv_device *device_ctx = host_device_ctx->device_ctx;
DPRINT_INFO(STORVSC_DRV, "sdev (%p) dev obj (%p) - host resetting...", DPRINT_INFO(STORVSC_DRV, "sdev (%p) dev obj (%p) - host resetting...",