From: "Jan Beulich" Subject: [PATCH] linux: satisfy newer modpost requirements II Date: Thu, 13 Mar 2008 16:31:26 +0000 Message-ID: <47D964EE.76E4.0078.0@novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Return-path: Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org 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 Index: head-2008-03-11/drivers/xen/fbfront/xenfb.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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.0000000= 00 +0100 @@ -727,7 +727,7 @@ static const struct xenbus_device_id xen }; MODULE_ALIAS("xen:vfb"); =20 -static struct xenbus_driver xenfb =3D { +static struct xenbus_driver xenfb_driver =3D { .name =3D "vfb", .owner =3D THIS_MODULE, .ids =3D xenfb_ids, @@ -745,12 +745,12 @@ static int __init xenfb_init(void) if (is_initial_xendomain()) return -ENODEV; =20 - return xenbus_register_frontend(&xenfb); + return xenbus_register_frontend(&xenfb_driver); } =20 static void __exit xenfb_cleanup(void) { - return xenbus_unregister_driver(&xenfb); + return xenbus_unregister_driver(&xenfb_driver); } =20 module_init(xenfb_init); Index: head-2008-03-11/drivers/xen/fbfront/xenkbd.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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"); =20 -static struct xenbus_driver xenkbd =3D { +static struct xenbus_driver xenkbd_driver =3D { .name =3D "vkbd", .owner =3D THIS_MODULE, .ids =3D xenkbd_ids, @@ -329,12 +329,12 @@ static int __init xenkbd_init(void) if (is_initial_xendomain()) return -ENODEV; =20 - return xenbus_register_frontend(&xenkbd); + return xenbus_register_frontend(&xenkbd_driver); } =20 static void __exit xenkbd_cleanup(void) { - return xenbus_unregister_driver(&xenkbd); + return xenbus_unregister_driver(&xenkbd_driver); } =20 module_init(xenkbd_init); Index: head-2008-03-11/drivers/xen/netfront/netfront.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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"); =20 =20 -static struct xenbus_driver netfront =3D { +static struct xenbus_driver netfront_driver =3D { .name =3D "vif", .owner =3D THIS_MODULE, .ids =3D netfront_ids, @@ -2187,7 +2187,7 @@ static int __init netif_init(void) (void)register_inetaddr_notifier(¬ifier_inetdev); #endif =20 - return xenbus_register_frontend(&netfront); + return xenbus_register_frontend(&netfront_driver); } module_init(netif_init); =20 @@ -2203,7 +2203,7 @@ static void __exit netif_exit(void) =20 netif_exit_accel(); =20 - return xenbus_unregister_driver(&netfront); + return xenbus_unregister_driver(&netfront_driver); } module_exit(netif_exit); =20