Commit 354b0a64 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Staging: hv: remove unneeded OnHostReset callback 



This callback only calls one function, so just call the function
instead, no need for indirection at all.

Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>.
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 99358ca7

drivers/staging/hv/StorVsc.c

+1 −2
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ static int StorVscOnDeviceRemove(struct hv_device *Device) 
	return 0;

}



static int StorVscOnHostReset(struct hv_device *Device)

int StorVscOnHostReset(struct hv_device *Device)

{

	struct storvsc_device *storDevice;

	struct storvsc_request_extension *request;
@@ -842,7 +842,6 @@ int StorVscInitialize(struct hv_driver *Driver) 
	storDriver->Base.OnCleanup	= StorVscOnCleanup;



	storDriver->OnIORequest		= StorVscOnIORequest;

	storDriver->OnHostReset		= StorVscOnHostReset;



	DPRINT_EXIT(STORVSC);

drivers/staging/hv/StorVscApi.h

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ struct storvsc_driver_object { 
	/* Specific to this driver */

	int (*OnIORequest)(struct hv_device *Device,

			   struct hv_storvsc_request *Request);

	int (*OnHostReset)(struct hv_device *Device);

};



struct storvsc_device_info {
@@ -105,6 +104,7 @@ struct storvsc_device_info { 


/* Interface */

int StorVscInitialize(struct hv_driver *driver);

int StorVscOnHostReset(struct hv_device *Device);

int BlkVscInitialize(struct hv_driver *driver);



#endif /* _STORVSC_API_H_ */

drivers/staging/hv/storvsc_drv.c

+1 −9
Original line number Diff line number Diff line
@@ -870,13 +870,6 @@ static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd) 
	struct host_device_context *host_device_ctx =

		(struct host_device_context *)scmnd->device->host->hostdata;

	struct device_context *device_ctx = host_device_ctx->device_ctx;

	struct driver_context *driver_ctx =

			driver_to_driver_context(device_ctx->device.driver);

	struct storvsc_driver_context *storvsc_drv_ctx =

			(struct storvsc_driver_context *)driver_ctx;



	struct storvsc_driver_object *storvsc_drv_obj =

			&storvsc_drv_ctx->drv_obj;



	DPRINT_ENTER(STORVSC_DRV);
@@ -884,8 +877,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 */

	ASSERT(storvsc_drv_obj->OnHostReset);

	ret = storvsc_drv_obj->OnHostReset(&device_ctx->device_obj);

	ret = StorVscOnHostReset(&device_ctx->device_obj);

	if (ret != 0) {

		DPRINT_EXIT(STORVSC_DRV);

		return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE