xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Staging: hv: Move probe_failed_work_item from vm_device

Browse Source 
In preparation for consolidating all device related state into
struct hv_device, move probe_failed_work_item from vm_device to
hv_device.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
K. Y. Srinivasan
2011-03-07 13:34:27 -08:00
committed by Greg Kroah-Hartman
parent 4af27d7036
commit a3c7fe9a33
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/hv/vmbus.h
View File

@@ -30,7 +30,6 @@
struct vm_device { struct vm_device {
struct work_struct probe_failed_work_item;
struct hv_guid class_id; struct hv_guid class_id;
struct hv_guid device_id; struct hv_guid device_id;
int probe_error; int probe_error;

3
drivers/staging/hv/vmbus_api.h
View File

@@ -26,6 +26,7 @@
#define _VMBUS_API_H_ #define _VMBUS_API_H_
#include <linux/device.h> #include <linux/device.h>
#include <linux/workqueue.h>
#define MAX_PAGE_BUFFER_COUNT 16 #define MAX_PAGE_BUFFER_COUNT 16
#define MAX_MULTIPAGE_BUFFER_COUNT 32 /* 128K */ #define MAX_MULTIPAGE_BUFFER_COUNT 32 /* 128K */
@@ -117,6 +118,8 @@ struct hv_device {
char name[64]; char name[64];
struct work_struct probe_failed_work_item;
/* the device type id of this device */ /* the device type id of this device */
struct hv_guid dev_type; struct hv_guid dev_type;

5
drivers/staging/hv/vmbus_drv.c
View File

@@ -904,6 +904,7 @@ static int vmbus_probe(struct device *child_device)
drv_to_hv_drv(child_device->driver); drv_to_hv_drv(child_device->driver);
struct vm_device *device_ctx = struct vm_device *device_ctx =
device_to_vm_device(child_device); device_to_vm_device(child_device);
struct hv_device *dev = &device_ctx->device_obj;
/* Let the specific open-source driver handles the probe if it can */ /* Let the specific open-source driver handles the probe if it can */
if (drv->driver.probe) { if (drv->driver.probe) {
@@ -915,9 +916,9 @@ static int vmbus_probe(struct device *child_device)
dev_name(child_device), child_device, dev_name(child_device), child_device,
child_device->driver->name, ret); child_device->driver->name, ret);
INIT_WORK(&device_ctx->probe_failed_work_item, INIT_WORK(&dev->probe_failed_work_item,
vmbus_probe_failed_cb); vmbus_probe_failed_cb);
schedule_work(&device_ctx->probe_failed_work_item); schedule_work(&dev->probe_failed_work_item);
} }
} else { } else {
DPRINT_ERR(VMBUS_DRV, "probe() method not set for driver - %s", DPRINT_ERR(VMBUS_DRV, "probe() method not set for driver - %s",