Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 228299
b: refs/heads/master
c: eb4f3e0
h: refs/heads/master
i:
  228297: 7990016
  228295: c66917f
v: v3
  • Loading branch information
Hank Janssen authored and Greg Kroah-Hartman committed Dec 7, 2010
1 parent 766630f commit ac3c87e
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8a046024a7cbbe9e4c16f4e34dda0f0dbcbc6723
refs/heads/master: eb4f3e0aa6bef825b964159923e38a0e4c027084
2 changes: 1 addition & 1 deletion trunk/drivers/staging/hv/blkvsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ static int BlkVscOnDeviceAdd(struct hv_device *Device, void *AdditionalInfo)
return ret;
}

int BlkVscInitialize(struct hv_driver *Driver)
int blk_vsc_initialize(struct hv_driver *Driver)
{
struct storvsc_driver_object *storDriver;
int ret = 0;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/hv/blkvsc_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -1487,7 +1487,7 @@ static int __init blkvsc_init(void)

DPRINT_INFO(BLKVSC_DRV, "Blkvsc initializing....");

ret = blkvsc_drv_init(BlkVscInitialize);
ret = blkvsc_drv_init(blk_vsc_initialize);

return ret;
}
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/hv/storvsc.c
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ static int StorVscOnDeviceRemove(struct hv_device *Device)
return 0;
}

int StorVscOnHostReset(struct hv_device *Device)
int stor_vsc_on_host_reset(struct hv_device *Device)
{
struct storvsc_device *storDevice;
struct storvsc_request_extension *request;
Expand Down Expand Up @@ -762,9 +762,9 @@ static void StorVscOnCleanup(struct hv_driver *Driver)
}

/*
* StorVscInitialize - Main entry point
* stor_vsc_initialize - Main entry point
*/
int StorVscInitialize(struct hv_driver *Driver)
int stor_vsc_initialize(struct hv_driver *Driver)
{
struct storvsc_driver_object *storDriver;

Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/staging/hv/storvsc_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ struct storvsc_device_info {
};

/* Interface */
int StorVscInitialize(struct hv_driver *driver);
int StorVscOnHostReset(struct hv_device *device);
int BlkVscInitialize(struct hv_driver *driver);
int stor_vsc_initialize(struct hv_driver *driver);
int stor_vsc_on_host_reset(struct hv_device *device);
int blk_vsc_initialize(struct hv_driver *driver);

#endif /* _STORVSC_API_H_ */
4 changes: 2 additions & 2 deletions trunk/drivers/staging/hv/storvsc_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -844,7 +844,7 @@ static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd)
scmnd->device, &device_ctx->device_obj);

/* Invokes the vsc to reset the host/bus */
ret = StorVscOnHostReset(&device_ctx->device_obj);
ret = stor_vsc_on_host_reset(&device_ctx->device_obj);
if (ret != 0)
return ret;

Expand Down Expand Up @@ -939,7 +939,7 @@ static int __init storvsc_init(void)
int ret;

DPRINT_INFO(STORVSC_DRV, "Storvsc initializing....");
ret = storvsc_drv_init(StorVscInitialize);
ret = storvsc_drv_init(stor_vsc_initialize);
return ret;
}

Expand Down

0 comments on commit ac3c87e

Please sign in to comment.