diff options
Diffstat (limited to 'drivers/xen/xen-pciback/xenbus.c')
-rw-r--r-- | drivers/xen/xen-pciback/xenbus.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/xen/xen-pciback/xenbus.c b/drivers/xen/xen-pciback/xenbus.c index 075525945e36..c80f9c84d08e 100644 --- a/drivers/xen/xen-pciback/xenbus.c +++ b/drivers/xen/xen-pciback/xenbus.c | |||
@@ -707,19 +707,16 @@ static int xen_pcibk_xenbus_remove(struct xenbus_device *dev) | |||
707 | return 0; | 707 | return 0; |
708 | } | 708 | } |
709 | 709 | ||
710 | static const struct xenbus_device_id xenpci_ids[] = { | 710 | static const struct xenbus_device_id xen_pcibk_ids[] = { |
711 | {"pci"}, | 711 | {"pci"}, |
712 | {""}, | 712 | {""}, |
713 | }; | 713 | }; |
714 | 714 | ||
715 | static struct xenbus_driver xenbus_xen_pcibk_driver = { | 715 | static DEFINE_XENBUS_DRIVER(xen_pcibk, DRV_NAME, |
716 | .name = DRV_NAME, | ||
717 | .owner = THIS_MODULE, | ||
718 | .ids = xenpci_ids, | ||
719 | .probe = xen_pcibk_xenbus_probe, | 716 | .probe = xen_pcibk_xenbus_probe, |
720 | .remove = xen_pcibk_xenbus_remove, | 717 | .remove = xen_pcibk_xenbus_remove, |
721 | .otherend_changed = xen_pcibk_frontend_changed, | 718 | .otherend_changed = xen_pcibk_frontend_changed, |
722 | }; | 719 | ); |
723 | 720 | ||
724 | const struct xen_pcibk_backend *__read_mostly xen_pcibk_backend; | 721 | const struct xen_pcibk_backend *__read_mostly xen_pcibk_backend; |
725 | 722 | ||
@@ -735,11 +732,11 @@ int __init xen_pcibk_xenbus_register(void) | |||
735 | if (passthrough) | 732 | if (passthrough) |
736 | xen_pcibk_backend = &xen_pcibk_passthrough_backend; | 733 | xen_pcibk_backend = &xen_pcibk_passthrough_backend; |
737 | pr_info(DRV_NAME ": backend is %s\n", xen_pcibk_backend->name); | 734 | pr_info(DRV_NAME ": backend is %s\n", xen_pcibk_backend->name); |
738 | return xenbus_register_backend(&xenbus_xen_pcibk_driver); | 735 | return xenbus_register_backend(&xen_pcibk_driver); |
739 | } | 736 | } |
740 | 737 | ||
741 | void __exit xen_pcibk_xenbus_unregister(void) | 738 | void __exit xen_pcibk_xenbus_unregister(void) |
742 | { | 739 | { |
743 | destroy_workqueue(xen_pcibk_wq); | 740 | destroy_workqueue(xen_pcibk_wq); |
744 | xenbus_unregister_driver(&xenbus_xen_pcibk_driver); | 741 | xenbus_unregister_driver(&xen_pcibk_driver); |
745 | } | 742 | } |