[Xen-changelog] [linux-2.6.18-xen] xen: satisfy newer modpost requirements, part 2

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1205839304 0
# Node ID 87a56ff291d3fb6d07ad746cbc427b2284e35b10
# Parent  ecf56205206a457d86a9dc370704c7c86f29aeb4
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@xxxxxxxxxx>
---
 drivers/xen/fbfront/xenfb.c     |    6 +++---
 drivers/xen/fbfront/xenkbd.c    |    6 +++---
 drivers/xen/netfront/netfront.c |    6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff -r ecf56205206a -r 87a56ff291d3 drivers/xen/fbfront/xenfb.c
--- a/drivers/xen/fbfront/xenfb.c       Tue Mar 18 11:20:34 2008 +0000
+++ b/drivers/xen/fbfront/xenfb.c       Tue Mar 18 11:21:44 2008 +0000
@@ -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,
@@ -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 -r ecf56205206a -r 87a56ff291d3 drivers/xen/fbfront/xenkbd.c
--- a/drivers/xen/fbfront/xenkbd.c      Tue Mar 18 11:20:34 2008 +0000
+++ b/drivers/xen/fbfront/xenkbd.c      Tue Mar 18 11:21:44 2008 +0000
@@ -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,
@@ -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 -r ecf56205206a -r 87a56ff291d3 drivers/xen/netfront/netfront.c
--- a/drivers/xen/netfront/netfront.c   Tue Mar 18 11:20:34 2008 +0000
+++ b/drivers/xen/netfront/netfront.c   Tue Mar 18 11:21:44 2008 +0000
@@ -2161,7 +2161,7 @@ MODULE_ALIAS("xen:vif");
 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);
 

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