Merge branch 'tip/perf/jump-label-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c
index c6aa66e5b52f..f875cfae3093 100644
--- a/drivers/net/wan/pc300_drv.c
+++ b/drivers/net/wan/pc300_drv.c
@@ -1,5 +1,5 @@
 #define USE_PCI_CLOCK
-static char rcsid[] = 
+static const char rcsid[] =
 "Revision: 3.4.5 Date: 2002/03/07 ";
 
 /*
@@ -451,11 +451,11 @@ static int dma_get_rx_frame_size(pc300_t * card, int ch)
                 if ((status & DST_EOM) || (first_bd == card->chan[ch].rx_last_bd)) {
                         /* Return the size of a good frame or incomplete bad frame 
                         * (dma_buf_read will clean the buffer descriptors in this case). */
-                        return (rcvd);
+                        return rcvd;
                 }
                 ptdescr = (card->hw.rambase + cpc_readl(&ptdescr->next));
         }
-        return (-1);
+        return -1;
 }
 
 /*
@@ -557,7 +557,7 @@ static int dma_buf_read(pc300_t * card, int ch, struct sk_buff *skb)
                 cpc_writel(card->hw.scabase + DRX_REG(EDAL, ch),
                            RX_BD_ADDR(ch, chan->rx_last_bd));
         }
-        return (rcvd);
+        return rcvd;
 }
 
 static void tx_dma_stop(pc300_t * card, int ch)
@@ -1733,7 +1733,7 @@ static u16 falc_pattern_test_error(pc300_t * card, int ch)
         pc300ch_t *chan = (pc300ch_t *) & card->chan[ch];
         falc_t *pfalc = (falc_t *) & chan->falc;
 
-        return (pfalc->bec);
+        return pfalc->bec;
 }
 
 /**********************************/
@@ -2819,7 +2819,7 @@ static int clock_rate_calc(u32 rate, u32 clock, int *br_io)
         *br_io = 0;
 
         if (rate == 0)
-                return (0);
+                return 0;
 
         for (br = 0, br_pwr = 1; br <= 9; br++, br_pwr <<= 1) {
                 if ((tc = clock / br_pwr / rate) <= 0xff) {
@@ -2832,11 +2832,11 @@ static int clock_rate_calc(u32 rate, u32 clock, int *br_io)
                 error = ((rate - (clock / br_pwr / rate)) / rate) * 1000;
                 /* Errors bigger than +/- 1% won't be tolerated */
                 if (error < -10 || error > 10)
-                        return (-1);
+                        return -1;
                 else
-                        return (tc);
+                        return tc;
         } else {
-                return (-1);
+                return -1;
         }
 }
 
@@ -3207,7 +3207,7 @@ static u32 detect_ram(pc300_t * card)
                         break;
                 }
         }
-        return (i);
+        return i;
 }
 
 static void plx_init(pc300_t * card)