xen: satisfy newer modpost requirements, part 2

References to __devinit probe functions are considered valid by newer
modprobe if the containing structure is named in certain ways. Use the
_driver suffix where necessary.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff --git a/drivers/xen/fbfront/xenfb.c b/drivers/xen/fbfront/xenfb.c
index 5e14799ae5495063a55df29b827bb8c67a278267..fcf020cdf0bf7483ed5523fcad8138b5cb33b090 100644 (file)
--- a/drivers/xen/fbfront/xenfb.c
+++ b/drivers/xen/fbfront/xenfb.c
@@ -727,7 +727,7 @@ static const struct xenbus_device_id xenfb_ids[] = {
 };
 MODULE_ALIAS("xen:vfb");
 
-static struct xenbus_driver xenfb = {
+static struct xenbus_driver xenfb_driver = {
        .name = "vfb",
        .owner = THIS_MODULE,
        .ids = xenfb_ids,
@@ -746,12 +746,12 @@ static int __init xenfb_init(void)
        if (is_initial_xendomain())
                return -ENODEV;
 
-       return xenbus_register_frontend(&xenfb);
+       return xenbus_register_frontend(&xenfb_driver);
 }
 
 static void __exit xenfb_cleanup(void)
 {
-       return xenbus_unregister_driver(&xenfb);
+       return xenbus_unregister_driver(&xenfb_driver);
 }
 
 module_init(xenfb_init);

diff --git a/drivers/xen/fbfront/xenkbd.c b/drivers/xen/fbfront/xenkbd.c
index 6bba9f49eabd90124c83cf165f699dcacfd104e0..975b675b168f90c84117f8ac9c46765eff3e747f 100644 (file)
--- a/drivers/xen/fbfront/xenkbd.c
+++ b/drivers/xen/fbfront/xenkbd.c
@@ -311,7 +311,7 @@ static const struct xenbus_device_id xenkbd_ids[] = {
 };
 MODULE_ALIAS("xen:vkbd");
 
-static struct xenbus_driver xenkbd = {
+static struct xenbus_driver xenkbd_driver = {
        .name = "vkbd",
        .owner = THIS_MODULE,
        .ids = xenkbd_ids,
@@ -330,12 +330,12 @@ static int __init xenkbd_init(void)
        if (is_initial_xendomain())
                return -ENODEV;
 
-       return xenbus_register_frontend(&xenkbd);
+       return xenbus_register_frontend(&xenkbd_driver);
 }
 
 static void __exit xenkbd_cleanup(void)
 {
-       return xenbus_unregister_driver(&xenkbd);
+       return xenbus_unregister_driver(&xenkbd_driver);
 }
 
 module_init(xenkbd_init);

diff --git a/drivers/xen/netfront/netfront.c b/drivers/xen/netfront/netfront.c
index 150676b7e3f32a15dd18ce2166b53171dae37dde..9c875e4a3d5c2d2637e0c94f4d7c680697f73af8 100644 (file)
--- a/drivers/xen/netfront/netfront.c
+++ b/drivers/xen/netfront/netfront.c
@@ -2161,7 +2161,7 @@ static const struct xenbus_device_id netfront_ids[] = {
 MODULE_ALIAS("xen:vif");
 
 
-static struct xenbus_driver netfront = {
+static struct xenbus_driver netfront_driver = {
        .name = "vif",
        .owner = THIS_MODULE,
        .ids = netfront_ids,
@@ -2200,7 +2200,7 @@ static int __init netif_init(void)
        (void)register_inetaddr_notifier(&notifier_inetdev);
 #endif
 
-       return xenbus_register_frontend(&netfront);
+       return xenbus_register_frontend(&netfront_driver);
 }
 module_init(netif_init);
 
@@ -2216,7 +2216,7 @@ static void __exit netif_exit(void)
 
        netif_exit_accel();
 
-       return xenbus_unregister_driver(&netfront);
+       return xenbus_unregister_driver(&netfront_driver);
 }
 module_exit(netif_exit);