Staging: hv: Rename struct device_context and re-arrange the fields inside

[net-next-2.6.git] / drivers / staging / hv / vmbus.h

diff --git a/drivers/staging/hv/vmbus.h b/drivers/staging/hv/vmbus.h
index ae0a896eb39258032ac3ac25fd8843036011ea6e..6404b8424beff4e8373fff95b476933f453f2c17 100644 (file)
--- a/drivers/staging/hv/vmbus.h
+++ b/drivers/staging/hv/vmbus.h
@@ -43,23 +43,23 @@ struct driver_context {
        void (*shutdown)(struct device *);
 };
 
-struct device_context {
+struct vm_device {
        struct work_struct probe_failed_work_item;
        struct hv_guid class_id;
        struct hv_guid device_id;
        int probe_error;
-       struct device device;
        struct hv_device device_obj;
+       struct device device;
 };
 
-static inline struct device_context *to_device_context(struct hv_device *d)
+static inline struct vm_device *to_vm_device(struct hv_device *d)
 {
-       return container_of(d, struct device_context, device_obj);
+       return container_of(d, struct vm_device, device_obj);
 }
 
-static inline struct device_context *device_to_device_context(struct device *d)
+static inline struct vm_device *device_to_vm_device(struct device *d)
 {
-       return container_of(d, struct device_context, device);
+       return container_of(d, struct vm_device, device);
 }
 
 static inline struct driver_context *driver_to_driver_context(struct device_driver *d)