driver core: fix up tty code to work with the new class changes.

Note, tty_class will be flushed out in the future, this is just to
get things building again properly.

6 files changed, 4 insertions, 13 deletions

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index e6e5d8de0d76..36a676873633 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -2288,17 +2288,16 @@ void __init console_init(void)
 extern int vty_init(void);
 #endif
 
-struct device_class tty_devclass = {
+static struct class tty_class = {
 	.name	= "tty",
 };
-EXPORT_SYMBOL(tty_devclass);
 
-static int __init tty_devclass_init(void)
+static int __init tty_class_init(void)
 {
-	return devclass_register(&tty_devclass);
+	return class_register(&tty_class);
 }
 
-postcore_initcall(tty_devclass_init);
+postcore_initcall(tty_class_init);
 
 /*
  * Ok, now we can initialize the rest of the tty devices and can count
diff --git a/drivers/serial/8250_acorn.c b/drivers/serial/8250_acorn.c
index db4666f894e5..d46b9f98e507 100644
--- a/drivers/serial/8250_acorn.c
+++ b/drivers/serial/8250_acorn.c
@@ -129,7 +129,6 @@ static struct ecard_driver serial_card_driver = {
 	.remove 	= __devexit_p(serial_card_remove),
 	.id_table	= serial_cids,
 	.drv = {
-		.devclass	= &tty_devclass,
 		.name		= "8250_acorn",
 	},
 };
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index d9e97644862e..f93ce1d43e43 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -2044,9 +2044,6 @@ static struct pci_driver serial_pci_driver = {
 	.suspend	= pciserial_suspend_one,
 	.resume		= pciserial_resume_one,
 	.id_table	= serial_pci_tbl,
-	.driver = {
-		.devclass = &tty_devclass,
-	},
 };
 
 static int __init serial8250_pci_init(void)
diff --git a/drivers/serial/sa1100.c b/drivers/serial/sa1100.c
index 2cd9a64b88fc..98e8231ec722 100644
--- a/drivers/serial/sa1100.c
+++ b/drivers/serial/sa1100.c
@@ -879,7 +879,6 @@ static int sa1100_serial_resume(struct device *dev, u32 level)
 static struct device_driver sa11x0_serial_driver = {
 	.name		= "sa11x0_serial",
 	.bus		= &system_bus_type,
-	.devclass	= &tty_devclass,
 	.suspend	= sa1100_serial_suspend,
 	.resume		= sa1100_serial_resume,
 };
diff --git a/drivers/usb/serial/bus.c b/drivers/usb/serial/bus.c
index 988f5927ad83..26f35b9f1cc8 100644
--- a/drivers/usb/serial/bus.c
+++ b/drivers/usb/serial/bus.c
@@ -142,7 +142,6 @@ int usb_serial_bus_register(struct usb_serial_device_type *device)
 	device->driver.bus = &usb_serial_bus_type;
 	device->driver.probe = usb_serial_device_probe;
 	device->driver.remove = usb_serial_device_remove;
-	device->driver.devclass = &tty_devclass;
 
 	retval = driver_register(&device->driver);
 
diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
index 0e35590dc50c..d8d9fc435a3f 100644
--- a/include/linux/tty_driver.h
+++ b/include/linux/tty_driver.h
@@ -231,6 +231,4 @@ extern struct list_head tty_drivers;
 #define SERIAL_TYPE_NORMAL	1
 #define SERIAL_TYPE_CALLOUT	2
 
-extern struct device_class tty_devclass;
-
 #endif /* #ifdef _LINUX_TTY_DRIVER_H */