mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 15:18:19 +00:00
Code Issues Releases Wiki Activity

Staging: hv: Rename vmbus_driver_context structure

Browse source 
Now that struct vmbus_driver_context is properly
cleaned up, rename this structure appropriately and
cleanup the code.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Mike Sterling <mike.sterling@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>
This commit is contained in:
K. Y. Srinivasan 2011-03-15 15:03:35 -07:00 committed by Greg Kroah-Hartman
parent 52e5c1cec8
commit 04677c0862
1 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
drivers/staging/hv/vmbus_drv.c
View file

@ -41,7 +41,7 @@
struct pci_dev *hv_pci_dev; struct pci_dev *hv_pci_dev;
/* Main vmbus driver data structure */ /* Main vmbus driver data structure */
struct vmbus_driver_context { struct hv_bus {
struct bus_type bus; struct bus_type bus;
struct tasklet_struct msg_dpc; struct tasklet_struct msg_dpc;
struct tasklet_struct event_dpc; struct tasklet_struct event_dpc;
@ -99,7 +99,7 @@ static struct device_attribute vmbus_device_attrs[] = {
}; };
/* The one and only one */ /* The one and only one */
static struct vmbus_driver_context vmbus_drv = { static struct hv_bus hv_bus = {
.bus.name = "vmbus", .bus.name = "vmbus",
.bus.match = vmbus_match, .bus.match = vmbus_match,
.bus.shutdown = vmbus_shutdown, .bus.shutdown = vmbus_shutdown,
@ -368,7 +368,6 @@ static ssize_t vmbus_show_device_attr(struct device *dev,
*/ */
static int vmbus_bus_init(struct pci_dev *pdev) static int vmbus_bus_init(struct pci_dev *pdev)
{ {
struct vmbus_driver_context *vmbus_drv_ctx = &vmbus_drv;
int ret; int ret;
unsigned int vector; unsigned int vector;
@ -393,16 +392,16 @@ static int vmbus_bus_init(struct pci_dev *pdev)
} }
vmbus_drv_ctx->bus.name = driver_name; hv_bus.bus.name = driver_name;
/* Initialize the bus context */ /* Initialize the bus context */
tasklet_init(&vmbus_drv_ctx->msg_dpc, vmbus_on_msg_dpc, tasklet_init(&hv_bus.msg_dpc, vmbus_on_msg_dpc,
(unsigned long)NULL); (unsigned long)NULL);
tasklet_init(&vmbus_drv_ctx->event_dpc, vmbus_on_event, tasklet_init(&hv_bus.event_dpc, vmbus_on_event,
(unsigned long)NULL); (unsigned long)NULL);
/* Now, register the bus with LDM */ /* Now, register the bus with LDM */
ret = bus_register(&vmbus_drv_ctx->bus); ret = bus_register(&hv_bus.bus);
if (ret) { if (ret) {
ret = -1; ret = -1;
goto cleanup; goto cleanup;
@ -417,7 +416,7 @@ static int vmbus_bus_init(struct pci_dev *pdev)
DPRINT_ERR(VMBUS_DRV, "ERROR - Unable to request IRQ %d", DPRINT_ERR(VMBUS_DRV, "ERROR - Unable to request IRQ %d",
pdev->irq); pdev->irq);
bus_unregister(&vmbus_drv_ctx->bus); bus_unregister(&hv_bus.bus);
ret = -1; ret = -1;
goto cleanup; goto cleanup;
@ -435,7 +434,7 @@ static int vmbus_bus_init(struct pci_dev *pdev)
ret = vmbus_connect(); ret = vmbus_connect();
if (ret) { if (ret) {
free_irq(pdev->irq, pdev); free_irq(pdev->irq, pdev);
bus_unregister(&vmbus_drv_ctx->bus); bus_unregister(&hv_bus.bus);
goto cleanup; goto cleanup;
} }
@ -454,7 +453,6 @@ static int vmbus_bus_init(struct pci_dev *pdev)
*/ */
static void vmbus_bus_exit(void) static void vmbus_bus_exit(void)
{ {
struct vmbus_driver_context *vmbus_drv_ctx = &vmbus_drv;
vmbus_release_unattached_channels(); vmbus_release_unattached_channels();
@ -463,12 +461,12 @@ static void vmbus_bus_exit(void)
hv_cleanup(); hv_cleanup();
bus_unregister(&vmbus_drv_ctx->bus); bus_unregister(&hv_bus.bus);
free_irq(hv_pci_dev->irq, hv_pci_dev); free_irq(hv_pci_dev->irq, hv_pci_dev);
tasklet_kill(&vmbus_drv_ctx->msg_dpc); tasklet_kill(&hv_bus.msg_dpc);
tasklet_kill(&vmbus_drv_ctx->event_dpc); tasklet_kill(&hv_bus.event_dpc);
} }
@ -491,7 +489,7 @@ int vmbus_child_driver_register(struct device_driver *drv)
drv, drv->name); drv, drv->name);
/* The child driver on this vmbus */ /* The child driver on this vmbus */
drv->bus = &vmbus_drv.bus; drv->bus = &hv_bus.bus;
ret = driver_register(drv); ret = driver_register(drv);
@ -585,7 +583,7 @@ int vmbus_child_device_register(struct hv_device *child_device_obj)
atomic_inc_return(&device_num)); atomic_inc_return(&device_num));
/* The new device belongs to this bus */ /* The new device belongs to this bus */
child_device_obj->device.bus = &vmbus_drv.bus; /* device->dev.bus; */ child_device_obj->device.bus = &hv_bus.bus; /* device->dev.bus; */
child_device_obj->device.parent = &hv_pci_dev->dev; child_device_obj->device.parent = &hv_pci_dev->dev;
child_device_obj->device.release = vmbus_device_release; child_device_obj->device.release = vmbus_device_release;
@ -853,10 +851,10 @@ static irqreturn_t vmbus_isr(int irq, void *dev_id)
/* Schedules a dpc if necessary */ /* Schedules a dpc if necessary */
if (ret > 0) { if (ret > 0) {
if (test_bit(0, (unsigned long *)&ret)) if (test_bit(0, (unsigned long *)&ret))
tasklet_schedule(&vmbus_drv.msg_dpc); tasklet_schedule(&hv_bus.msg_dpc);
if (test_bit(1, (unsigned long *)&ret)) if (test_bit(1, (unsigned long *)&ret))
tasklet_schedule(&vmbus_drv.event_dpc); tasklet_schedule(&hv_bus.event_dpc);
return IRQ_HANDLED; return IRQ_HANDLED;
} else { } else {