1 files changed, 24 insertions, 36 deletions

diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c
index 1477e8593476..dc2803b5eb09 100644
--- a/drivers/usb/serial/io_edgeport.c
+++ b/drivers/usb/serial/io_edgeport.c
@@ -915,8 +915,8 @@ static int edge_open(struct tty_struct *tty, struct usb_serial_port *port)
                 return -ENOMEM;
         }
 
-        dev_dbg(dev, "%s(%d) - Initialize TX fifo to %d bytes\n",
-                __func__, port->number, edge_port->maxTxCredits);
+        dev_dbg(dev, "%s - Initialize TX fifo to %d bytes\n",
+                __func__, edge_port->maxTxCredits);
 
         return 0;
 }
@@ -1122,9 +1122,8 @@ static int edge_write(struct tty_struct *tty, struct usb_serial_port *port,
         copySize = min((unsigned int)count,
                                 (edge_port->txCredits - fifo->count));
 
-        dev_dbg(&port->dev, "%s(%d) of %d byte(s) Fifo room  %d -- will copy %d bytes\n",
-                __func__, port->number, count,
-                        edge_port->txCredits - fifo->count, copySize);
+        dev_dbg(&port->dev, "%s of %d byte(s) Fifo room  %d -- will copy %d bytes\n",
+                __func__, count, edge_port->txCredits - fifo->count, copySize);
 
         /* catch writes of 0 bytes which the tty driver likes to give us,
            and when txCredits is empty */
@@ -1216,9 +1215,8 @@ static void send_more_port_data(struct edgeport_serial *edge_serial,
         if (edge_port->write_in_progress ||
             !edge_port->open             ||
             (fifo->count == 0)) {
-                dev_dbg(dev, "%s(%d) EXIT - fifo %d, PendingWrite = %d\n",
-                        __func__, edge_port->port->number,
-                        fifo->count, edge_port->write_in_progress);
+                dev_dbg(dev, "%s EXIT - fifo %d, PendingWrite = %d\n",
+                        __func__, fifo->count, edge_port->write_in_progress);
                 goto exit_send;
         }
 
@@ -1230,9 +1228,8 @@ static void send_more_port_data(struct edgeport_serial *edge_serial,
          * it's better to wait for more credits so we can do a larger write.
          */
         if (edge_port->txCredits < EDGE_FW_GET_TX_CREDITS_SEND_THRESHOLD(edge_port->maxTxCredits, EDGE_FW_BULK_MAX_PACKET_SIZE)) {
-                dev_dbg(dev, "%s(%d) Not enough credit - fifo %d TxCredit %d\n",
-                        __func__, edge_port->port->number, fifo->count,
-                        edge_port->txCredits);
+                dev_dbg(dev, "%s Not enough credit - fifo %d TxCredit %d\n",
+                        __func__, fifo->count, edge_port->txCredits);
                 goto exit_send;
         }
 
@@ -1256,10 +1253,8 @@ static void send_more_port_data(struct edgeport_serial *edge_serial,
                 edge_port->write_in_progress = false;
                 goto exit_send;
         }
-        buffer[0] = IOSP_BUILD_DATA_HDR1(edge_port->port->number
-                                - edge_port->port->serial->minor, count);
-        buffer[1] = IOSP_BUILD_DATA_HDR2(edge_port->port->number
-                                - edge_port->port->serial->minor, count);
+        buffer[0] = IOSP_BUILD_DATA_HDR1(edge_port->port->port_number, count);
+        buffer[1] = IOSP_BUILD_DATA_HDR2(edge_port->port->port_number, count);
 
         /* now copy our data */
         bytesleft =  fifo->size - fifo->tail;
@@ -1377,8 +1372,7 @@ static int edge_chars_in_buffer(struct tty_struct *tty)
                                                 edge_port->txfifo.count;
         spin_unlock_irqrestore(&edge_port->ep_lock, flags);
         if (num_chars) {
-                dev_dbg(&port->dev, "%s(port %d) - returns %d\n", __func__,
-                        port->number, num_chars);
+                dev_dbg(&port->dev, "%s - returns %d\n", __func__, num_chars);
         }
 
         return num_chars;
@@ -1575,8 +1569,8 @@ static int get_serial_info(struct edgeport_port *edge_port,
         memset(&tmp, 0, sizeof(tmp));
 
         tmp.type                = PORT_16550A;
-        tmp.line                = edge_port->port->serial->minor;
-        tmp.port                = edge_port->port->number;
+        tmp.line                = edge_port->port->minor;
+        tmp.port                = edge_port->port->port_number;
         tmp.irq                 = 0;
         tmp.flags               = ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ;
         tmp.xmit_fifo_size      = edge_port->maxTxCredits;
@@ -1601,15 +1595,15 @@ static int edge_ioctl(struct tty_struct *tty,
         DEFINE_WAIT(wait);
         struct edgeport_port *edge_port = usb_get_serial_port_data(port);
 
-        dev_dbg(&port->dev, "%s - port %d, cmd = 0x%x\n", __func__, port->number, cmd);
+        dev_dbg(&port->dev, "%s - cmd = 0x%x\n", __func__, cmd);
 
         switch (cmd) {
         case TIOCSERGETLSR:
-                dev_dbg(&port->dev, "%s (%d) TIOCSERGETLSR\n", __func__,  port->number);
+                dev_dbg(&port->dev, "%s TIOCSERGETLSR\n", __func__);
                 return get_lsr_info(edge_port, (unsigned int __user *) arg);
 
         case TIOCGSERIAL:
-                dev_dbg(&port->dev, "%s (%d) TIOCGSERIAL\n", __func__,  port->number);
+                dev_dbg(&port->dev, "%s TIOCGSERIAL\n", __func__);
                 return get_serial_info(edge_port, (struct serial_struct __user *) arg);
         }
         return -ENOIOCTLCMD;
@@ -2181,9 +2175,8 @@ static int send_iosp_ext_cmd(struct edgeport_port *edge_port,
 
         currentCommand = buffer;
 
-        MAKE_CMD_EXT_CMD(&currentCommand, &length,
-                edge_port->port->number - edge_port->port->serial->minor,
-                command, param);
+        MAKE_CMD_EXT_CMD(&currentCommand, &length, edge_port->port->port_number,
+                         command, param);
 
         status = write_cmd_usb(edge_port, buffer, length);
         if (status) {
@@ -2266,18 +2259,16 @@ static int send_cmd_write_baud_rate(struct edgeport_port *edge_port,
         int cmdLen = 0;
         int divisor;
         int status;
-        unsigned char number =
-                edge_port->port->number - edge_port->port->serial->minor;
+        u32 number = edge_port->port->port_number;
 
         if (edge_serial->is_epic &&
             !edge_serial->epic_descriptor.Supports.IOSPSetBaudRate) {
-                dev_dbg(dev, "SendCmdWriteBaudRate - NOT Setting baud rate for port = %d, baud = %d\n",
-                        edge_port->port->number, baudRate);
+                dev_dbg(dev, "SendCmdWriteBaudRate - NOT Setting baud rate for port, baud = %d\n",
+                        baudRate);
                 return 0;
         }
 
-        dev_dbg(dev, "%s - port = %d, baud = %d\n", __func__,
-                edge_port->port->number, baudRate);
+        dev_dbg(dev, "%s - baud = %d\n", __func__, baudRate);
 
         status = calc_baud_rate_divisor(dev, baudRate, &divisor);
         if (status) {
@@ -2388,9 +2379,8 @@ static int send_cmd_write_uart_register(struct edgeport_port *edge_port,
         currCmd = cmdBuffer;
 
         /* Build a cmd in the buffer to write the given register */
-        MAKE_CMD_WRITE_REG(&currCmd, &cmdLen,
-                edge_port->port->number - edge_port->port->serial->minor,
-                regNum, regValue);
+        MAKE_CMD_WRITE_REG(&currCmd, &cmdLen, edge_port->port->port_number,
+                           regNum, regValue);
 
         status = write_cmd_usb(edge_port, cmdBuffer, cmdLen);
         if (status) {
@@ -2424,8 +2414,6 @@ static void change_port_settings(struct tty_struct *tty,
         __u8 txFlow;
         int status;
 
-        dev_dbg(dev, "%s - port %d\n", __func__, edge_port->port->number);
-
         if (!edge_port->open &&
             !edge_port->openPending) {
                 dev_dbg(dev, "%s - port not opened\n", __func__);