1 files changed, 26 insertions, 26 deletions

diff --git a/drivers/char/hvsi.c b/drivers/char/hvsi.c
index d5a752da322f..59c6f9ab94e4 100644
--- a/drivers/char/hvsi.c
+++ b/drivers/char/hvsi.c
@@ -246,7 +246,7 @@ static void compact_inbuf(struct hvsi_struct *hp, uint8_t *read_to)
 {
         int remaining = (int)(hp->inbuf_end - read_to);
 
-        pr_debug("%s: %i chars remain\n", __FUNCTION__, remaining);
+        pr_debug("%s: %i chars remain\n", __func__, remaining);
 
         if (read_to != hp->inbuf)
                 memmove(hp->inbuf, read_to, remaining);
@@ -365,7 +365,7 @@ static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
         packet.u.version = HVSI_VERSION;
         packet.query_seqno = query_seqno+1;
 
-        pr_debug("%s: sending %i bytes\n", __FUNCTION__, packet.len);
+        pr_debug("%s: sending %i bytes\n", __func__, packet.len);
         dbg_dump_hex((uint8_t*)&packet, packet.len);
 
         wrote = hvc_put_chars(hp->vtermno, (char *)&packet, packet.len);
@@ -437,7 +437,7 @@ static struct tty_struct *hvsi_recv_data(struct hvsi_struct *hp,
                 return NULL;
 
         if (overflow > 0) {
-                pr_debug("%s: got >TTY_THRESHOLD_THROTTLE bytes\n", __FUNCTION__);
+                pr_debug("%s: got >TTY_THRESHOLD_THROTTLE bytes\n", __func__);
                 datalen = TTY_THRESHOLD_THROTTLE;
         }
 
@@ -448,7 +448,7 @@ static struct tty_struct *hvsi_recv_data(struct hvsi_struct *hp,
                  * we still have more data to deliver, so we need to save off the
                  * overflow and send it later
                  */
-                pr_debug("%s: deferring overflow\n", __FUNCTION__);
+                pr_debug("%s: deferring overflow\n", __func__);
                 memcpy(hp->throttle_buf, data + TTY_THRESHOLD_THROTTLE, overflow);
                 hp->n_throttle = overflow;
         }
@@ -474,11 +474,11 @@ static int hvsi_load_chunk(struct hvsi_struct *hp, struct tty_struct **flip,
 
         chunklen = hvsi_read(hp, hp->inbuf_end, HVSI_MAX_READ);
         if (chunklen == 0) {
-                pr_debug("%s: 0-length read\n", __FUNCTION__);
+                pr_debug("%s: 0-length read\n", __func__);
                 return 0;
         }
 
-        pr_debug("%s: got %i bytes\n", __FUNCTION__, chunklen);
+        pr_debug("%s: got %i bytes\n", __func__, chunklen);
         dbg_dump_hex(hp->inbuf_end, chunklen);
 
         hp->inbuf_end += chunklen;
@@ -495,7 +495,7 @@ static int hvsi_load_chunk(struct hvsi_struct *hp, struct tty_struct **flip,
                         continue;
                 }
 
-                pr_debug("%s: handling %i-byte packet\n", __FUNCTION__,
+                pr_debug("%s: handling %i-byte packet\n", __func__,
                                 len_packet(packet));
                 dbg_dump_packet(packet);
 
@@ -526,7 +526,7 @@ static int hvsi_load_chunk(struct hvsi_struct *hp, struct tty_struct **flip,
                 packet += len_packet(packet);
 
                 if (*hangup || *handshake) {
-                        pr_debug("%s: hangup or handshake\n", __FUNCTION__);
+                        pr_debug("%s: hangup or handshake\n", __func__);
                         /*
                          * we need to send the hangup now before receiving any more data.
                          * If we get "data, hangup, data", we can't deliver the second
@@ -543,7 +543,7 @@ static int hvsi_load_chunk(struct hvsi_struct *hp, struct tty_struct **flip,
 
 static void hvsi_send_overflow(struct hvsi_struct *hp)
 {
-        pr_debug("%s: delivering %i bytes overflow\n", __FUNCTION__,
+        pr_debug("%s: delivering %i bytes overflow\n", __func__,
                         hp->n_throttle);
 
         hvsi_insert_chars(hp, hp->throttle_buf, hp->n_throttle);
@@ -563,7 +563,7 @@ static irqreturn_t hvsi_interrupt(int irq, void *arg)
         unsigned long flags;
         int again = 1;
 
-        pr_debug("%s\n", __FUNCTION__);
+        pr_debug("%s\n", __func__);
 
         while (again) {
                 spin_lock_irqsave(&hp->lock, flags);
@@ -647,7 +647,7 @@ static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
         packet.seqno = atomic_inc_return(&hp->seqno);
         packet.verb = verb;
 
-        pr_debug("%s: sending %i bytes\n", __FUNCTION__, packet.len);
+        pr_debug("%s: sending %i bytes\n", __func__, packet.len);
         dbg_dump_hex((uint8_t*)&packet, packet.len);
 
         wrote = hvc_put_chars(hp->vtermno, (char *)&packet, packet.len);
@@ -674,7 +674,7 @@ static int hvsi_get_mctrl(struct hvsi_struct *hp)
                 return ret;
         }
 
-        pr_debug("%s: mctrl 0x%x\n", __FUNCTION__, hp->mctrl);
+        pr_debug("%s: mctrl 0x%x\n", __func__, hp->mctrl);
 
         return 0;
 }
@@ -694,7 +694,7 @@ static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
         if (mctrl & TIOCM_DTR)
                 packet.word = HVSI_TSDTR;
 
-        pr_debug("%s: sending %i bytes\n", __FUNCTION__, packet.len);
+        pr_debug("%s: sending %i bytes\n", __func__, packet.len);
         dbg_dump_hex((uint8_t*)&packet, packet.len);
 
         wrote = hvc_put_chars(hp->vtermno, (char *)&packet, packet.len);
@@ -790,7 +790,7 @@ static void hvsi_close_protocol(struct hvsi_struct *hp)
         packet.len = 6;
         packet.verb = VSV_CLOSE_PROTOCOL;
 
-        pr_debug("%s: sending %i bytes\n", __FUNCTION__, packet.len);
+        pr_debug("%s: sending %i bytes\n", __func__, packet.len);
         dbg_dump_hex((uint8_t*)&packet, packet.len);
 
         hvc_put_chars(hp->vtermno, (char *)&packet, packet.len);
@@ -803,7 +803,7 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp)
         int line = tty->index;
         int ret;
 
-        pr_debug("%s\n", __FUNCTION__);
+        pr_debug("%s\n", __func__);
 
         if (line < 0 || line >= hvsi_count)
                 return -ENODEV;
@@ -868,7 +868,7 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
         struct hvsi_struct *hp = tty->driver_data;
         unsigned long flags;
 
-        pr_debug("%s\n", __FUNCTION__);
+        pr_debug("%s\n", __func__);
 
         if (tty_hung_up_p(filp))
                 return;
@@ -920,7 +920,7 @@ static void hvsi_hangup(struct tty_struct *tty)
         struct hvsi_struct *hp = tty->driver_data;
         unsigned long flags;
 
-        pr_debug("%s\n", __FUNCTION__);
+        pr_debug("%s\n", __func__);
 
         spin_lock_irqsave(&hp->lock, flags);
 
@@ -942,7 +942,7 @@ static void hvsi_push(struct hvsi_struct *hp)
         n = hvsi_put_chars(hp, hp->outbuf, hp->n_outbuf);
         if (n > 0) {
                 /* success */
-                pr_debug("%s: wrote %i chars\n", __FUNCTION__, n);
+                pr_debug("%s: wrote %i chars\n", __func__, n);
                 hp->n_outbuf = 0;
         } else if (n == -EIO) {
                 __set_state(hp, HVSI_FSP_DIED);
@@ -965,7 +965,7 @@ static void hvsi_write_worker(struct work_struct *work)
 
         spin_lock_irqsave(&hp->lock, flags);
 
-        pr_debug("%s: %i chars in buffer\n", __FUNCTION__, hp->n_outbuf);
+        pr_debug("%s: %i chars in buffer\n", __func__, hp->n_outbuf);
 
         if (!is_open(hp)) {
                 /*
@@ -983,7 +983,7 @@ static void hvsi_write_worker(struct work_struct *work)
                 schedule_delayed_work(&hp->writer, 10);
         else {
 #ifdef DEBUG
-                pr_debug("%s: outbuf emptied after %li jiffies\n", __FUNCTION__,
+                pr_debug("%s: outbuf emptied after %li jiffies\n", __func__,
                                 jiffies - start_j);
                 start_j = 0;
 #endif /* DEBUG */
@@ -1020,11 +1020,11 @@ static int hvsi_write(struct tty_struct *tty,
 
         spin_lock_irqsave(&hp->lock, flags);
 
-        pr_debug("%s: %i chars in buffer\n", __FUNCTION__, hp->n_outbuf);
+        pr_debug("%s: %i chars in buffer\n", __func__, hp->n_outbuf);
 
         if (!is_open(hp)) {
                 /* we're either closing or not yet open; don't accept data */
-                pr_debug("%s: not open\n", __FUNCTION__);
+                pr_debug("%s: not open\n", __func__);
                 goto out;
         }
 
@@ -1058,7 +1058,7 @@ out:
         spin_unlock_irqrestore(&hp->lock, flags);
 
         if (total != origcount)
-                pr_debug("%s: wanted %i, only wrote %i\n", __FUNCTION__, origcount,
+                pr_debug("%s: wanted %i, only wrote %i\n", __func__, origcount,
                         total);
 
         return total;
@@ -1072,7 +1072,7 @@ static void hvsi_throttle(struct tty_struct *tty)
 {
         struct hvsi_struct *hp = (struct hvsi_struct *)tty->driver_data;
 
-        pr_debug("%s\n", __FUNCTION__);
+        pr_debug("%s\n", __func__);
 
         h_vio_signal(hp->vtermno, VIO_IRQ_DISABLE);
 }
@@ -1083,7 +1083,7 @@ static void hvsi_unthrottle(struct tty_struct *tty)
         unsigned long flags;
         int shouldflip = 0;
 
-        pr_debug("%s\n", __FUNCTION__);
+        pr_debug("%s\n", __func__);
 
         spin_lock_irqsave(&hp->lock, flags);
         if (hp->n_throttle) {
@@ -1302,7 +1302,7 @@ static int __init hvsi_console_init(void)
                 hp->virq = irq_create_mapping(NULL, irq[0]);
                 if (hp->virq == NO_IRQ) {
                         printk(KERN_ERR "%s: couldn't create irq mapping for 0x%x\n",
-                                __FUNCTION__, irq[0]);
+                                __func__, irq[0]);
                         continue;
                 }