[patch 2.6.25-git 2/3] pcmcia: remove pcmcia_bus_interface warnings

David Brownell david-b at pacbell.net
Mon Apr 28 04:04:14 EDT 2008


From: David Brownell <dbrownell at users.sourceforge.net>

Remove section mismatch warning associated with 16-bit PCMCIA
card support:  just rename the "class_interface" as a *_driver.

Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
---
 drivers/pcmcia/ds.c |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

--- g26.orig/drivers/pcmcia/ds.c	2008-04-27 23:10:36.000000000 -0700
+++ g26/drivers/pcmcia/ds.c	2008-04-27 23:13:53.000000000 -0700
@@ -1520,7 +1520,7 @@ static void pcmcia_bus_remove_socket(str
 
 
 /* the pcmcia_bus_interface is used to handle pcmcia socket devices */
-static struct class_interface pcmcia_bus_interface = {
+static struct class_interface pcmcia_bus_driver = {
 	.class = &pcmcia_socket_class,
 	.add_dev = &pcmcia_bus_add_socket,
 	.remove_dev = &pcmcia_bus_remove_socket,
@@ -1550,7 +1550,7 @@ static int __init init_pcmcia_bus(void)
 		printk(KERN_WARNING "pcmcia: bus_register error: %d\n", ret);
 		return ret;
 	}
-	ret = class_interface_register(&pcmcia_bus_interface);
+	ret = class_interface_register(&pcmcia_bus_driver);
 	if (ret < 0) {
 		printk(KERN_WARNING
 			"pcmcia: class_interface_register error: %d\n", ret);
@@ -1570,8 +1570,7 @@ static void __exit exit_pcmcia_bus(void)
 {
 	pcmcia_cleanup_ioctl();
 
-	class_interface_unregister(&pcmcia_bus_interface);
-
+	class_interface_unregister(&pcmcia_bus_driver);
 	bus_unregister(&pcmcia_bus_type);
 }
 module_exit(exit_pcmcia_bus);



More information about the linux-pcmcia mailing list