Staging: hv: storvsc_drv: Get rid of the indirection in invoking storvsc_dev_add()
authorK. Y. Srinivasan <kys@microsoft.com>
Tue, 10 May 2011 14:54:49 +0000 (07:54 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 11 May 2011 20:48:42 +0000 (13:48 -0700)
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>
drivers/staging/hv/storvsc_drv.c

index 233aa4c56e95a6d9ab491d8f8ae1894779ec3960..599b5d29552ee71516bc429e66322a8bb6f8a0e4 100644 (file)
@@ -784,15 +784,10 @@ static struct scsi_host_template scsi_driver = {
 static int storvsc_probe(struct hv_device *device)
 {
        int ret;
-       struct storvsc_driver *storvsc_drv_obj =
-                drv_to_stordrv(device->device.driver);
        struct Scsi_Host *host;
        struct hv_host_device *host_dev;
        struct storvsc_device_info device_info;
 
-       if (!storvsc_drv_obj->base.dev_add)
-               return -1;
-
        host = scsi_host_alloc(&scsi_driver,
                               sizeof(struct hv_host_device));
        if (!host)
@@ -818,7 +813,7 @@ static int storvsc_probe(struct hv_device *device)
 
        device_info.port_number = host->host_no;
        /* Call to the vsc driver to add the device */
-       ret = storvsc_drv_obj->base.dev_add(device, (void *)&device_info);
+       ret = storvsc_dev_add(device, (void *)&device_info);
 
        if (ret != 0) {
                kmem_cache_destroy(host_dev->request_pool);