]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
TTY: synclink_cs, final cleanup in synclink_cs_init
authorJiri Slaby <jslaby@suse.cz>
Tue, 7 Aug 2012 19:47:54 +0000 (21:47 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 13 Aug 2012 23:50:20 +0000 (16:50 -0700)
* use <tab> for indentation
* add KERN_* to printks
* no more assignments in if's like if ((rc = function()))

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/char/pcmcia/synclink_cs.c

index ce277f74bd10b4de8c7ae93c09aa3446565c8c18..923c3a47db0c0a89cb2ee458047aa4ea214594dc 100644 (file)
@@ -2803,47 +2803,46 @@ static const struct tty_operations mgslpc_ops = {
 
 static int __init synclink_cs_init(void)
 {
-    int rc;
+       int rc;
 
-    if (break_on_load) {
-           mgslpc_get_text_ptr();
-           BREAKPOINT();
-    }
+       if (break_on_load) {
+               mgslpc_get_text_ptr();
+               BREAKPOINT();
+       }
 
-    serial_driver = tty_alloc_driver(MAX_DEVICE_COUNT,
-                   TTY_DRIVER_REAL_RAW |
-                   TTY_DRIVER_DYNAMIC_DEV);
-    if (!serial_driver) {
-           rc = -ENOMEM;
-           goto err;
-    }
+       serial_driver = tty_alloc_driver(MAX_DEVICE_COUNT,
+                       TTY_DRIVER_REAL_RAW |
+                       TTY_DRIVER_DYNAMIC_DEV);
+       if (!serial_driver) {
+               rc = -ENOMEM;
+               goto err;
+       }
 
-    /* Initialize the tty_driver structure */
-
-    serial_driver->driver_name = "synclink_cs";
-    serial_driver->name = "ttySLP";
-    serial_driver->major = ttymajor;
-    serial_driver->minor_start = 64;
-    serial_driver->type = TTY_DRIVER_TYPE_SERIAL;
-    serial_driver->subtype = SERIAL_TYPE_NORMAL;
-    serial_driver->init_termios = tty_std_termios;
-    serial_driver->init_termios.c_cflag =
-           B9600 | CS8 | CREAD | HUPCL | CLOCAL;
-    tty_set_operations(serial_driver, &mgslpc_ops);
-
-    if ((rc = tty_register_driver(serial_driver)) < 0) {
-           printk("%s(%d):Couldn't register serial driver\n",
-                  __FILE__,__LINE__);
-           goto err_put_tty;
-    }
+       /* Initialize the tty_driver structure */
+       serial_driver->driver_name = "synclink_cs";
+       serial_driver->name = "ttySLP";
+       serial_driver->major = ttymajor;
+       serial_driver->minor_start = 64;
+       serial_driver->type = TTY_DRIVER_TYPE_SERIAL;
+       serial_driver->subtype = SERIAL_TYPE_NORMAL;
+       serial_driver->init_termios = tty_std_termios;
+       serial_driver->init_termios.c_cflag =
+       B9600 | CS8 | CREAD | HUPCL | CLOCAL;
+       tty_set_operations(serial_driver, &mgslpc_ops);
+
+       rc = tty_register_driver(serial_driver);
+       if (rc < 0) {
+               printk(KERN_ERR "%s(%d):Couldn't register serial driver\n",
+                               __FILE__, __LINE__);
+               goto err_put_tty;
+       }
 
        rc = pcmcia_register_driver(&mgslpc_driver);
        if (rc < 0)
                goto err_unreg_tty;
 
-    printk("%s %s, tty major#%d\n",
-          driver_name, driver_version,
-          serial_driver->major);
+       printk(KERN_INFO "%s %s, tty major#%d\n", driver_name, driver_version,
+                       serial_driver->major);
 
        return 0;
 err_unreg_tty: