s2io: Using static const generally increases object text and decreases data size...

text	   data	    bss	    dec	    hex	filename
 109387	    389	  24432	 134208	  20c40	drivers/net/s2io.o.old
 109358	    389	  24432	 134179	  20c23	drivers/net/s2io.o.new

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Jon Mason <jon.mason@exar.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 80efc05d4d646d2bcacffffbbfbe106e88a776d2..9a1e32fb720bdcddbc6338a9decfbfd54c9516cf 100644 (file)
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -3598,10 +3598,12 @@ static int s2io_set_swapper(struct s2io_nic *sp)
        val64 = readq(&bar0->pif_rd_swapper_fb);
        if (val64 != 0x0123456789ABCDEFULL) {
                int i = 0;
-               u64 value[] = { 0xC30000C3C30000C3ULL,   /* FE=1, SE=1 */
-                               0x8100008181000081ULL,  /* FE=1, SE=0 */
-                               0x4200004242000042ULL,  /* FE=0, SE=1 */
-                               0};                     /* FE=0, SE=0 */
+               static const u64 value[] = {
+                       0xC30000C3C30000C3ULL,  /* FE=1, SE=1 */
+                       0x8100008181000081ULL,  /* FE=1, SE=0 */
+                       0x4200004242000042ULL,  /* FE=0, SE=1 */
+                       0                       /* FE=0, SE=0 */
+               };
 
                while (i < 4) {
                        writeq(value[i], &bar0->swapper_ctrl);
@@ -3627,10 +3629,12 @@ static int s2io_set_swapper(struct s2io_nic *sp)
 
        if (val64 != valt) {
                int i = 0;
-               u64 value[] = { 0x00C3C30000C3C300ULL,  /* FE=1, SE=1 */
-                               0x0081810000818100ULL,  /* FE=1, SE=0 */
-                               0x0042420000424200ULL,  /* FE=0, SE=1 */
-                               0};                     /* FE=0, SE=0 */
+               static const u64 value[] = {
+                       0x00C3C30000C3C300ULL,  /* FE=1, SE=1 */
+                       0x0081810000818100ULL,  /* FE=1, SE=0 */
+                       0x0042420000424200ULL,  /* FE=0, SE=1 */
+                       0                       /* FE=0, SE=0 */
+               };
 
                while (i < 4) {
                        writeq((value[i] | valr), &bar0->swapper_ctrl);