leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Staging: hv: storvsc: Use the driver_data to identify ide

Browse Source 
Use the driver_data to identify ide devices in storvsc_probe().

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
K. Y. Srinivasan 2011-09-13 10:59:39 -07:00 committed by Greg Kroah-Hartman
parent 84946899bd
commit ef52a81bf5
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/staging/hv/storvsc_drv.c
View File

@ -1359,17 +1359,20 @@ static struct scsi_host_template scsi_driver = {
.dma_boundary = PAGE_SIZE-1, .dma_boundary = PAGE_SIZE-1,
}; };
/* enum {
* The storvsc_probe function assumes that the IDE guid SCSI_GUID,
* is the second entry. IDE_GUID,
*/ };
static const struct hv_vmbus_device_id id_table[] = { static const struct hv_vmbus_device_id id_table[] = {
/* SCSI guid */ /* SCSI guid */
{ VMBUS_DEVICE(0xd9, 0x63, 0x61, 0xba, 0xa1, 0x04, 0x29, 0x4d, { VMBUS_DEVICE(0xd9, 0x63, 0x61, 0xba, 0xa1, 0x04, 0x29, 0x4d,
0xb6, 0x05, 0x72, 0xe2, 0xff, 0xb1, 0xdc, 0x7f) }, 0xb6, 0x05, 0x72, 0xe2, 0xff, 0xb1, 0xdc, 0x7f)
.driver_data = SCSI_GUID },
/* IDE guid */ /* IDE guid */
{ VMBUS_DEVICE(0x32, 0x26, 0x41, 0x32, 0xcb, 0x86, 0xa2, 0x44, { VMBUS_DEVICE(0x32, 0x26, 0x41, 0x32, 0xcb, 0x86, 0xa2, 0x44,
0x9b, 0x5c, 0x50, 0xd1, 0x41, 0x73, 0x54, 0xf5) }, 0x9b, 0x5c, 0x50, 0xd1, 0x41, 0x73, 0x54, 0xf5)
.driver_data = IDE_GUID },
{ }, { },
}; };
@ -1387,15 +1390,10 @@ static int storvsc_probe(struct hv_device *device,
struct Scsi_Host *host; struct Scsi_Host *host;
struct hv_host_device *host_dev; struct hv_host_device *host_dev;
struct storvsc_device_info device_info; struct storvsc_device_info device_info;
bool dev_is_ide; bool dev_is_ide = ((dev_id->driver_data == IDE_GUID) ? true : false);
int path = 0; int path = 0;
int target = 0; int target = 0;
if (!memcmp(&device->dev_type.b, id_table[1].guid, sizeof(uuid_le)))
dev_is_ide = true;
else
dev_is_ide = false;
host = scsi_host_alloc(&scsi_driver, host = scsi_host_alloc(&scsi_driver,
sizeof(struct hv_host_device)); sizeof(struct hv_host_device));
if (!host) if (!host)