1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c
index 1b178c6e8937..3864967202b5 100644
--- a/drivers/xen/xenbus/xenbus_probe.c
+++ b/drivers/xen/xenbus/xenbus_probe.c
@@ -291,14 +291,9 @@ void xenbus_dev_shutdown(struct device *_dev)
 EXPORT_SYMBOL_GPL(xenbus_dev_shutdown);
 
 int xenbus_register_driver_common(struct xenbus_driver *drv,
-                                  struct xen_bus_type *bus,
-                                  struct module *owner,
-                                  const char *mod_name)
+                                  struct xen_bus_type *bus)
 {
-        drv->driver.name = drv->name;
         drv->driver.bus = &bus->bus;
-        drv->driver.owner = owner;
-        drv->driver.mod_name = mod_name;
 
         return driver_register(&drv->driver);
 }
@@ -730,6 +725,8 @@ static int __init xenbus_init(void)
         if (!xen_domain())
                 return -ENODEV;
 
+        xenbus_ring_ops_init();
+
         if (xen_hvm_domain()) {
                 uint64_t v = 0;
                 err = hvm_get_parameter(HVM_PARAM_STORE_EVTCHN, &v);