ia64/linux-2.6.18-xen.hg

changeset 481:87a56ff291d3

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>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Mar 18 11:21:44 2008 +0000 (2008-03-18)
parents ecf56205206a
children f619448beab5
files drivers/xen/fbfront/xenfb.c drivers/xen/fbfront/xenkbd.c drivers/xen/netfront/netfront.c
line diff
     1.1 --- a/drivers/xen/fbfront/xenfb.c	Tue Mar 18 11:20:34 2008 +0000
     1.2 +++ b/drivers/xen/fbfront/xenfb.c	Tue Mar 18 11:21:44 2008 +0000
     1.3 @@ -727,7 +727,7 @@ static const struct xenbus_device_id xen
     1.4  };
     1.5  MODULE_ALIAS("xen:vfb");
     1.6  
     1.7 -static struct xenbus_driver xenfb = {
     1.8 +static struct xenbus_driver xenfb_driver = {
     1.9  	.name = "vfb",
    1.10  	.owner = THIS_MODULE,
    1.11  	.ids = xenfb_ids,
    1.12 @@ -746,12 +746,12 @@ static int __init xenfb_init(void)
    1.13  	if (is_initial_xendomain())
    1.14  		return -ENODEV;
    1.15  
    1.16 -	return xenbus_register_frontend(&xenfb);
    1.17 +	return xenbus_register_frontend(&xenfb_driver);
    1.18  }
    1.19  
    1.20  static void __exit xenfb_cleanup(void)
    1.21  {
    1.22 -	return xenbus_unregister_driver(&xenfb);
    1.23 +	return xenbus_unregister_driver(&xenfb_driver);
    1.24  }
    1.25  
    1.26  module_init(xenfb_init);
     2.1 --- a/drivers/xen/fbfront/xenkbd.c	Tue Mar 18 11:20:34 2008 +0000
     2.2 +++ b/drivers/xen/fbfront/xenkbd.c	Tue Mar 18 11:21:44 2008 +0000
     2.3 @@ -311,7 +311,7 @@ static const struct xenbus_device_id xen
     2.4  };
     2.5  MODULE_ALIAS("xen:vkbd");
     2.6  
     2.7 -static struct xenbus_driver xenkbd = {
     2.8 +static struct xenbus_driver xenkbd_driver = {
     2.9  	.name = "vkbd",
    2.10  	.owner = THIS_MODULE,
    2.11  	.ids = xenkbd_ids,
    2.12 @@ -330,12 +330,12 @@ static int __init xenkbd_init(void)
    2.13  	if (is_initial_xendomain())
    2.14  		return -ENODEV;
    2.15  
    2.16 -	return xenbus_register_frontend(&xenkbd);
    2.17 +	return xenbus_register_frontend(&xenkbd_driver);
    2.18  }
    2.19  
    2.20  static void __exit xenkbd_cleanup(void)
    2.21  {
    2.22 -	return xenbus_unregister_driver(&xenkbd);
    2.23 +	return xenbus_unregister_driver(&xenkbd_driver);
    2.24  }
    2.25  
    2.26  module_init(xenkbd_init);
     3.1 --- a/drivers/xen/netfront/netfront.c	Tue Mar 18 11:20:34 2008 +0000
     3.2 +++ b/drivers/xen/netfront/netfront.c	Tue Mar 18 11:21:44 2008 +0000
     3.3 @@ -2161,7 +2161,7 @@ static const struct xenbus_device_id net
     3.4  MODULE_ALIAS("xen:vif");
     3.5  
     3.6  
     3.7 -static struct xenbus_driver netfront = {
     3.8 +static struct xenbus_driver netfront_driver = {
     3.9  	.name = "vif",
    3.10  	.owner = THIS_MODULE,
    3.11  	.ids = netfront_ids,
    3.12 @@ -2200,7 +2200,7 @@ static int __init netif_init(void)
    3.13  	(void)register_inetaddr_notifier(&notifier_inetdev);
    3.14  #endif
    3.15  
    3.16 -	return xenbus_register_frontend(&netfront);
    3.17 +	return xenbus_register_frontend(&netfront_driver);
    3.18  }
    3.19  module_init(netif_init);
    3.20  
    3.21 @@ -2216,7 +2216,7 @@ static void __exit netif_exit(void)
    3.22  
    3.23  	netif_exit_accel();
    3.24  
    3.25 -	return xenbus_unregister_driver(&netfront);
    3.26 +	return xenbus_unregister_driver(&netfront_driver);
    3.27  }
    3.28  module_exit(netif_exit);
    3.29