Commit ffb78a26169351f6c22cdae481b057d50d5d759b
Committed by
Linus Torvalds
1 parent
df6b07949b
Exists in
master
and in
39 other branches
get xenbus_driver ->probe() "recognized" by modpost
... by giving the instances' names magic suffix recognized by modpost ;-/ Their ->probe() is __devinit Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 3 changed files with 9 additions and 9 deletions Side-by-side Diff
drivers/input/xen-kbdfront.c
... | ... | @@ -323,7 +323,7 @@ |
323 | 323 | { "" } |
324 | 324 | }; |
325 | 325 | |
326 | -static struct xenbus_driver xenkbd = { | |
326 | +static struct xenbus_driver xenkbd_driver = { | |
327 | 327 | .name = "vkbd", |
328 | 328 | .owner = THIS_MODULE, |
329 | 329 | .ids = xenkbd_ids, |
330 | 330 | |
... | ... | @@ -342,12 +342,12 @@ |
342 | 342 | if (xen_initial_domain()) |
343 | 343 | return -ENODEV; |
344 | 344 | |
345 | - return xenbus_register_frontend(&xenkbd); | |
345 | + return xenbus_register_frontend(&xenkbd_driver); | |
346 | 346 | } |
347 | 347 | |
348 | 348 | static void __exit xenkbd_cleanup(void) |
349 | 349 | { |
350 | - xenbus_unregister_driver(&xenkbd); | |
350 | + xenbus_unregister_driver(&xenkbd_driver); | |
351 | 351 | } |
352 | 352 | |
353 | 353 | module_init(xenkbd_init); |
drivers/net/xen-netfront.c
... | ... | @@ -1785,7 +1785,7 @@ |
1785 | 1785 | return 0; |
1786 | 1786 | } |
1787 | 1787 | |
1788 | -static struct xenbus_driver netfront = { | |
1788 | +static struct xenbus_driver netfront_driver = { | |
1789 | 1789 | .name = "vif", |
1790 | 1790 | .owner = THIS_MODULE, |
1791 | 1791 | .ids = netfront_ids, |
... | ... | @@ -1805,7 +1805,7 @@ |
1805 | 1805 | |
1806 | 1806 | printk(KERN_INFO "Initialising Xen virtual ethernet driver.\n"); |
1807 | 1807 | |
1808 | - return xenbus_register_frontend(&netfront); | |
1808 | + return xenbus_register_frontend(&netfront_driver); | |
1809 | 1809 | } |
1810 | 1810 | module_init(netif_init); |
1811 | 1811 | |
... | ... | @@ -1815,7 +1815,7 @@ |
1815 | 1815 | if (xen_initial_domain()) |
1816 | 1816 | return; |
1817 | 1817 | |
1818 | - xenbus_unregister_driver(&netfront); | |
1818 | + xenbus_unregister_driver(&netfront_driver); | |
1819 | 1819 | } |
1820 | 1820 | module_exit(netif_exit); |
1821 | 1821 |
drivers/video/xen-fbfront.c
... | ... | @@ -668,7 +668,7 @@ |
668 | 668 | { "" } |
669 | 669 | }; |
670 | 670 | |
671 | -static struct xenbus_driver xenfb = { | |
671 | +static struct xenbus_driver xenfb_driver = { | |
672 | 672 | .name = "vfb", |
673 | 673 | .owner = THIS_MODULE, |
674 | 674 | .ids = xenfb_ids, |
675 | 675 | |
... | ... | @@ -687,12 +687,12 @@ |
687 | 687 | if (xen_initial_domain()) |
688 | 688 | return -ENODEV; |
689 | 689 | |
690 | - return xenbus_register_frontend(&xenfb); | |
690 | + return xenbus_register_frontend(&xenfb_driver); | |
691 | 691 | } |
692 | 692 | |
693 | 693 | static void __exit xenfb_cleanup(void) |
694 | 694 | { |
695 | - xenbus_unregister_driver(&xenfb); | |
695 | + xenbus_unregister_driver(&xenfb_driver); | |
696 | 696 | } |
697 | 697 | |
698 | 698 | module_init(xenfb_init); |