Merge tag 'afs-netfs-lib-20210426' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / tty / vcc.c

diff --git a/drivers/tty/vcc.c b/drivers/tty/vcc.c
index e2d6205..0a3a71e 100644 (file)
--- a/drivers/tty/vcc.c
+++ b/drivers/tty/vcc.c
@@ -14,16 +14,9 @@
 #include <asm/vio.h>
 #include <asm/ldc.h>
 
-#define DRV_MODULE_NAME                "vcc"
-#define DRV_MODULE_VERSION     "1.1"
-#define DRV_MODULE_RELDATE     "July 1, 2017"
-
-static char version[] =
-       DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")";
-
 MODULE_DESCRIPTION("Sun LDOM virtual console concentrator driver");
 MODULE_LICENSE("GPL");
-MODULE_VERSION(DRV_MODULE_VERSION);
+MODULE_VERSION("1.1");
 
 struct vcc_port {
        struct vio_driver_state vio;
@@ -59,16 +52,14 @@ struct vcc_port {
 #define VCC_CTL_BREAK          -1
 #define VCC_CTL_HUP            -2
 
-static const char vcc_driver_name[] = "vcc";
-static const char vcc_device_node[] = "vcc";
 static struct tty_driver *vcc_tty_driver;
 
 static struct vcc_port *vcc_table[VCC_MAX_PORTS];
 static DEFINE_SPINLOCK(vcc_table_lock);
 
-int vcc_dbg;
-int vcc_dbg_ldc;
-int vcc_dbg_vio;
+static unsigned int vcc_dbg;
+static unsigned int vcc_dbg_ldc;
+static unsigned int vcc_dbg_vio;
 
 module_param(vcc_dbg, uint, 0664);
 module_param(vcc_dbg_ldc, uint, 0664);
@@ -735,11 +726,6 @@ static int vcc_open(struct tty_struct *tty, struct file *vcc_file)
 {
        struct vcc_port *port;
 
-       if (unlikely(!tty)) {
-               pr_err("VCC: open: Invalid TTY handle\n");
-               return -ENXIO;
-       }
-
        if (tty->count > 1)
                return -EBUSY;
 
@@ -773,11 +759,6 @@ static int vcc_open(struct tty_struct *tty, struct file *vcc_file)
 
 static void vcc_close(struct tty_struct *tty, struct file *vcc_file)
 {
-       if (unlikely(!tty)) {
-               pr_err("VCC: close: Invalid TTY handle\n");
-               return;
-       }
-
        if (unlikely(tty->count > 1))
                return;
 
@@ -805,11 +786,6 @@ static void vcc_hangup(struct tty_struct *tty)
 {
        struct vcc_port *port;
 
-       if (unlikely(!tty)) {
-               pr_err("VCC: hangup: Invalid TTY handle\n");
-               return;
-       }
-
        port = vcc_get_ne(tty->index);
        if (unlikely(!port)) {
                pr_err("VCC: hangup: Failed to find VCC port\n");
@@ -839,11 +815,6 @@ static int vcc_write(struct tty_struct *tty, const unsigned char *buf,
        int tosend = 0;
        int rv = -EINVAL;
 
-       if (unlikely(!tty)) {
-               pr_err("VCC: write: Invalid TTY handle\n");
-               return -ENXIO;
-       }
-
        port = vcc_get_ne(tty->index);
        if (unlikely(!port)) {
                pr_err("VCC: write: Failed to find VCC port");
@@ -904,15 +875,10 @@ static int vcc_write_room(struct tty_struct *tty)
        struct vcc_port *port;
        u64 num;
 
-       if (unlikely(!tty)) {
-               pr_err("VCC: write_room: Invalid TTY handle\n");
-               return -ENXIO;
-       }
-
        port = vcc_get_ne(tty->index);
        if (unlikely(!port)) {
                pr_err("VCC: write_room: Failed to find VCC port\n");
-               return -ENODEV;
+               return 0;
        }
 
        num = VCC_BUFF_LEN - port->chars_in_buffer;
@@ -927,15 +893,10 @@ static int vcc_chars_in_buffer(struct tty_struct *tty)
        struct vcc_port *port;
        u64 num;
 
-       if (unlikely(!tty)) {
-               pr_err("VCC: chars_in_buffer: Invalid TTY handle\n");
-               return -ENXIO;
-       }
-
        port = vcc_get_ne(tty->index);
        if (unlikely(!port)) {
                pr_err("VCC: chars_in_buffer: Failed to find VCC port\n");
-               return -ENODEV;
+               return 0;
        }
 
        num = port->chars_in_buffer;
@@ -950,11 +911,6 @@ static int vcc_break_ctl(struct tty_struct *tty, int state)
        struct vcc_port *port;
        unsigned long flags;
 
-       if (unlikely(!tty)) {
-               pr_err("VCC: break_ctl: Invalid TTY handle\n");
-               return -ENXIO;
-       }
-
        port = vcc_get_ne(tty->index);
        if (unlikely(!port)) {
                pr_err("VCC: break_ctl: Failed to find VCC port\n");
@@ -985,11 +941,6 @@ static int vcc_install(struct tty_driver *driver, struct tty_struct *tty)
        struct tty_port *port_tty;
        int ret;
 
-       if (unlikely(!tty)) {
-               pr_err("VCC: install: Invalid TTY handle\n");
-               return -ENXIO;
-       }
-
        if (tty->index >= VCC_MAX_PORTS)
                return -EINVAL;
 
@@ -1024,11 +975,6 @@ static void vcc_cleanup(struct tty_struct *tty)
 {
        struct vcc_port *port;
 
-       if (unlikely(!tty)) {
-               pr_err("VCC: cleanup: Invalid TTY handle\n");
-               return;
-       }
-
        port = vcc_get(tty->index, true);
        if (port) {
                port->tty = NULL;
@@ -1066,16 +1012,14 @@ static int vcc_tty_init(void)
 {
        int rv;
 
-       pr_info("VCC: %s\n", version);
-
        vcc_tty_driver = tty_alloc_driver(VCC_MAX_PORTS, VCC_TTY_FLAGS);
        if (IS_ERR(vcc_tty_driver)) {
                pr_err("VCC: TTY driver alloc failed\n");
                return PTR_ERR(vcc_tty_driver);
        }
 
-       vcc_tty_driver->driver_name = vcc_driver_name;
-       vcc_tty_driver->name = vcc_device_node;
+       vcc_tty_driver->driver_name = "vcc";
+       vcc_tty_driver->name = "vcc";
 
        vcc_tty_driver->minor_start = VCC_MINOR_START;
        vcc_tty_driver->type = TTY_DRIVER_TYPE_SYSTEM;