[Xen-devel] [PATCH] linux: satisfy newer modpost requirements II

["Jan Beulich" <jbeulich@xxxxxxxxxx>]

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.

As usual, written and tested on 2.6.25-rc5 and made apply to the 2.6.18
tree without further testing.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>

Index: head-2008-03-11/drivers/xen/fbfront/xenfb.c
===================================================================
--- head-2008-03-11.orig/drivers/xen/fbfront/xenfb.c    2008-03-12 
17:16:04.000000000 +0100
+++ head-2008-03-11/drivers/xen/fbfront/xenfb.c 2008-03-11 14:46:33.000000000 
+0100
@@ -727,7 +727,7 @@ static const struct xenbus_device_id xen
 };
 MODULE_ALIAS("xen:vfb");
 
-static struct xenbus_driver xenfb = {
+static struct xenbus_driver xenfb_driver = {
        .name = "vfb",
        .owner = THIS_MODULE,
        .ids = xenfb_ids,
@@ -745,12 +745,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);
Index: head-2008-03-11/drivers/xen/fbfront/xenkbd.c
===================================================================
--- head-2008-03-11.orig/drivers/xen/fbfront/xenkbd.c   2008-03-12 
17:16:04.000000000 +0100
+++ head-2008-03-11/drivers/xen/fbfront/xenkbd.c        2008-03-11 
14:46:33.000000000 +0100
@@ -311,7 +311,7 @@ static const struct xenbus_device_id xen
 };
 MODULE_ALIAS("xen:vkbd");
 
-static struct xenbus_driver xenkbd = {
+static struct xenbus_driver xenkbd_driver = {
        .name = "vkbd",
        .owner = THIS_MODULE,
        .ids = xenkbd_ids,
@@ -329,12 +329,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);
Index: head-2008-03-11/drivers/xen/netfront/netfront.c
===================================================================
--- head-2008-03-11.orig/drivers/xen/netfront/netfront.c        2008-03-12 
17:16:04.000000000 +0100
+++ head-2008-03-11/drivers/xen/netfront/netfront.c     2008-03-11 
14:46:33.000000000 +0100
@@ -2149,7 +2149,7 @@ static const struct xenbus_device_id net
 MODULE_ALIAS("xen:vif");
 
 
-static struct xenbus_driver netfront = {
+static struct xenbus_driver netfront_driver = {
        .name = "vif",
        .owner = THIS_MODULE,
        .ids = netfront_ids,
@@ -2187,7 +2187,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);
 
@@ -2203,7 +2203,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);
 




_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel