All of lore.kernel.org
 help / color / mirror / Atom feed
From: "K. Y. Srinivasan" <kys@microsoft.com>
To: gregkh@suse.de, linux-kernel@vger.kernel.org,
	devel@linuxdriverproject.org, virtualization@lists.osdl.org
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Subject: [PATCH 06/25] Staging: hv: storvsc: Use the driver_data to identify ide
Date: Thu,  8 Sep 2011 07:24:17 -0700	[thread overview]
Message-ID: <1315491876-9554-6-git-send-email-kys@microsoft.com> (raw)
In-Reply-To: <1315491876-9554-1-git-send-email-kys@microsoft.com>

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>
---
 drivers/staging/hv/storvsc_drv.c |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index fff1e5b..e2c63e5 100644
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -1366,10 +1366,12 @@ static struct scsi_host_template scsi_driver = {
 static const struct hv_vmbus_device_id id_table[] = {
 	/* SCSI guid */
 	{ 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 = 0 },
 	/* IDE guid */
 	{ 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 = 1 },
 	{ },
 };
 
@@ -1387,15 +1389,10 @@ static int storvsc_probe(struct hv_device *device,
 	struct Scsi_Host *host;
 	struct hv_host_device *host_dev;
 	struct storvsc_device_info device_info;
-	bool dev_is_ide;
+	bool dev_is_ide = ((dev_id->driver_data == 1) ? true : false);
 	int path = 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,
 			       sizeof(struct hv_host_device));
 	if (!host)
-- 
1.7.4.1

WARNING: multiple messages have this Message-ID (diff)
From: "K. Y. Srinivasan" <kys@microsoft.com>
To: gregkh@suse.de, linux-kernel@vger.kernel.org,
	devel@linuxdriverproject.org, virtualization@lists.osdl.org
Cc: "K. Y. Srinivasan" <kys@microsoft.com>,
	Haiyang Zhang <haiyangz@microsoft.com>
Subject: [PATCH 06/25] Staging: hv: storvsc: Use the driver_data to identify ide
Date: Thu,  8 Sep 2011 07:24:17 -0700	[thread overview]
Message-ID: <1315491876-9554-6-git-send-email-kys@microsoft.com> (raw)
In-Reply-To: <1315491876-9554-1-git-send-email-kys@microsoft.com>

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>
---
 drivers/staging/hv/storvsc_drv.c |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index fff1e5b..e2c63e5 100644
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -1366,10 +1366,12 @@ static struct scsi_host_template scsi_driver = {
 static const struct hv_vmbus_device_id id_table[] = {
 	/* SCSI guid */
 	{ 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 = 0 },
 	/* IDE guid */
 	{ 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 = 1 },
 	{ },
 };
 
@@ -1387,15 +1389,10 @@ static int storvsc_probe(struct hv_device *device,
 	struct Scsi_Host *host;
 	struct hv_host_device *host_dev;
 	struct storvsc_device_info device_info;
-	bool dev_is_ide;
+	bool dev_is_ide = ((dev_id->driver_data == 1) ? true : false);
 	int path = 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,
 			       sizeof(struct hv_host_device));
 	if (!host)
-- 
1.7.4.1


  parent reply	other threads:[~2011-09-08 14:24 UTC|newest]

Thread overview: 65+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-08 14:24 [PATCH 0000/0025] Staging: hv: Driver cleanup K. Y. Srinivasan
2011-09-08 14:24 ` K. Y. Srinivasan
2011-09-08 14:24 ` [PATCH 01/25] Staging: hv: vmbus: Rename vmbus_child_device_create K. Y. Srinivasan
2011-09-08 14:24   ` K. Y. Srinivasan
2011-09-08 14:24   ` [PATCH 02/25] Staging: hv: vmbus: Rename vmbus_child_device_register K. Y. Srinivasan
2011-09-08 14:24     ` K. Y. Srinivasan
2011-09-08 14:24   ` [PATCH 03/25] Staging: hv: vmbus: Rename vmbus_child_device_unregister K. Y. Srinivasan
2011-09-08 14:24   ` [PATCH 04/25] Staging: hv: vmbus: Cleanup dated comments in channel_mgmt.c K. Y. Srinivasan
2011-09-08 14:24   ` [PATCH 05/25] Staging: hv: vmbus: Change the signature of struct hv_driver probe function K. Y. Srinivasan
2011-09-08 14:24     ` K. Y. Srinivasan
2011-09-09 20:38     ` Greg KH
2011-09-09 20:38       ` Greg KH
2011-09-08 14:24   ` K. Y. Srinivasan [this message]
2011-09-08 14:24     ` [PATCH 06/25] Staging: hv: storvsc: Use the driver_data to identify ide K. Y. Srinivasan
2011-09-09 20:41     ` Greg KH
2011-09-08 14:24   ` [PATCH 07/25] Staging: hv: vmbus: Change the signature of struct hv_driver remove() function K. Y. Srinivasan
2011-09-08 14:24     ` K. Y. Srinivasan
2011-09-09 20:40     ` Greg KH
2011-09-08 14:24   ` [PATCH 08/25] Staging: hv: util: Perform some service specific initialization in util_probe() K. Y. Srinivasan
2011-09-08 14:24     ` K. Y. Srinivasan
2011-09-08 14:24   ` [PATCH 09/25] Staging: hv: util: Perform some service specific de-initialization in util_remove() K. Y. Srinivasan
2011-09-08 14:24     ` K. Y. Srinivasan
2011-09-09 20:42     ` Greg KH
2011-09-09 20:42       ` Greg KH
2011-09-10 14:31       ` KY Srinivasan
2011-09-10 14:31         ` KY Srinivasan
2011-09-10 18:35         ` Greg KH
2011-09-10 18:35           ` Greg KH
2011-09-08 14:24   ` [PATCH 10/25] Staging: hv: vmbus: Return proper error code in vmbus_remove() K. Y. Srinivasan
2011-09-09 20:43     ` Greg KH
2011-09-09 20:43       ` Greg KH
2011-09-10 14:22       ` KY Srinivasan
2011-09-10 14:22         ` KY Srinivasan
2011-09-10 18:33         ` Greg KH
2011-09-10 20:33           ` KY Srinivasan
2011-09-08 14:24   ` [PATCH 11/25] Staging: hv: util: Properly handle util services in the util driver K. Y. Srinivasan
2011-09-08 14:24   ` [PATCH 12/25] Staging: hv: vmbus: Get rid of hv_cb_utils[] and other unneeded code K. Y. Srinivasan
2011-09-08 14:24   ` [PATCH 13/25] Staging: hv: vmbus: Get rid of the module dependency K. Y. Srinivasan
2011-09-08 14:24     ` K. Y. Srinivasan
2011-09-08 14:24   ` [PATCH 14/25] Staging: hv: vmbus: Introduce functions for setting and getting driver data K. Y. Srinivasan
2011-09-08 14:24     ` K. Y. Srinivasan
2011-09-08 14:24   ` [PATCH 15/25] Staging: hv: storvsc: Get rid of storvsc_dev_add() by inlining the code K. Y. Srinivasan
2011-09-08 14:24     ` K. Y. Srinivasan
2011-09-08 14:24   ` [PATCH 16/25] Staging: hv: storvsc: Get rid of alloc_stor_device() " K. Y. Srinivasan
2011-09-08 14:24     ` K. Y. Srinivasan
2011-09-08 14:24   ` [PATCH 17/25] Staging: hv: storvsc: Get rid of some unnecessary state and definitions K. Y. Srinivasan
2011-09-08 14:24     ` K. Y. Srinivasan
2011-09-08 14:24   ` [PATCH 18/25] Staging: hv: storvsc: Eliminate the usage of ext field in struct hv_device K. Y. Srinivasan
2011-09-08 14:24     ` K. Y. Srinivasan
2011-09-09 20:44     ` Greg KH
2011-09-09 20:44       ` Greg KH
2011-09-10 14:16       ` KY Srinivasan
2011-09-10 18:28         ` Greg KH
2011-09-08 14:24   ` [PATCH 19/25] Staging: hv: netvsc: Get rid of the usage of the " K. Y. Srinivasan
2011-09-08 14:24   ` [PATCH 20/25] Staging: hv: mousevsc: " K. Y. Srinivasan
2011-09-08 14:24   ` [PATCH 21/25] Staging: hv: vmbus: Get rid " K. Y. Srinivasan
2011-09-08 14:24     ` K. Y. Srinivasan
2011-09-08 14:24   ` [PATCH 22/25] Staging: hv: vmbus: Do not allocate struct hv_device_info on the stack K. Y. Srinivasan
2011-09-08 14:24     ` K. Y. Srinivasan
2011-09-08 14:24   ` [PATCH 23/25] Staging: hv: netvsc: Rename netDevice as net_device K. Y. Srinivasan
2011-09-08 14:24     ` K. Y. Srinivasan
2011-09-08 14:24   ` [PATCH 24/25] Staging: hv: netvsc: Rename rndisDevice to rndis_device K. Y. Srinivasan
2011-09-08 14:24     ` K. Y. Srinivasan
2011-09-08 14:24   ` [PATCH 25/25] Staging: hv: netvsc: Rename deviceInfo as device_info K. Y. Srinivasan
2011-09-08 14:24     ` K. Y. Srinivasan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1315491876-9554-6-git-send-email-kys@microsoft.com \
    --to=kys@microsoft.com \
    --cc=devel@linuxdriverproject.org \
    --cc=gregkh@suse.de \
    --cc=haiyangz@microsoft.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=virtualization@lists.osdl.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.