* [PATCH 01/62] 3c501: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 02/62] 3c503: " Joe Perches
` (56 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
9927 472 2128 12527 30ef drivers/net/3c501.o.new
9915 484 2128 12527 30ef drivers/net/3c501.o.old
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/3c501.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/3c501.c b/drivers/net/3c501.c
index 1776ab6..9e1c03e 100644
--- a/drivers/net/3c501.c
+++ b/drivers/net/3c501.c
@@ -158,8 +158,8 @@ static int mem_start;
struct net_device * __init el1_probe(int unit)
{
struct net_device *dev = alloc_etherdev(sizeof(struct net_local));
- static unsigned ports[] = { 0x280, 0x300, 0};
- unsigned *port;
+ static const unsigned ports[] = { 0x280, 0x300, 0};
+ const unsigned *port;
int err = 0;
if (!dev)
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 02/62] 3c503: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
2010-11-21 2:38 ` [PATCH 01/62] 3c501: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 03/62] 3c507: " Joe Perches
` (55 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
7938 140 1688 9766 2626 drivers/net/3c503.o.new
7951 140 1688 9779 2633 drivers/net/3c503.o.old
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/3c503.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/3c503.c b/drivers/net/3c503.c
index 4777a1c..d84f6e8 100644
--- a/drivers/net/3c503.c
+++ b/drivers/net/3c503.c
@@ -392,8 +392,8 @@ el2_open(struct net_device *dev)
int retval;
if (dev->irq < 2) {
- int irqlist[] = {5, 9, 3, 4, 0};
- int *irqp = irqlist;
+ static const int irqlist[] = {5, 9, 3, 4, 0};
+ const int *irqp = irqlist;
outb(EGACFR_NORM, E33G_GACFR); /* Enable RAM and interrupts. */
do {
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 03/62] 3c507: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
2010-11-21 2:38 ` [PATCH 01/62] 3c501: " Joe Perches
2010-11-21 2:38 ` [PATCH 02/62] 3c503: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 04/62] 3c527: " Joe Perches
` (54 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
10001 400 2168 12569 3119 drivers/net/3c507.o.new
9981 420 2168 12569 3119 drivers/net/3c507.o.old
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/3c507.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c
index 475a66d..1e94555 100644
--- a/drivers/net/3c507.c
+++ b/drivers/net/3c507.c
@@ -311,8 +311,8 @@ static int mem_start;
struct net_device * __init el16_probe(int unit)
{
struct net_device *dev = alloc_etherdev(sizeof(struct net_local));
- static unsigned ports[] = { 0x300, 0x320, 0x340, 0x280, 0};
- unsigned *port;
+ static const unsigned ports[] = { 0x300, 0x320, 0x340, 0x280, 0};
+ const unsigned *port;
int err = -ENODEV;
if (!dev)
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 04/62] 3c527: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (2 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 03/62] 3c507: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 05/62] at1700: " Joe Perches
` (53 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
11256 114 2256 13626 353a drivers/net/3c527.o.old
11256 114 2256 13626 353a drivers/net/3c527.o.new
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/3c527.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c
index 013b7c3..8c094ba 100644
--- a/drivers/net/3c527.c
+++ b/drivers/net/3c527.c
@@ -317,13 +317,13 @@ static int __init mc32_probe1(struct net_device *dev, int slot)
u8 POS;
u32 base;
struct mc32_local *lp = netdev_priv(dev);
- static u16 mca_io_bases[]={
+ static const u16 mca_io_bases[] = {
0x7280,0x7290,
0x7680,0x7690,
0x7A80,0x7A90,
0x7E80,0x7E90
};
- static u32 mca_mem_bases[]={
+ static const u32 mca_mem_bases[] = {
0x00C0000,
0x00C4000,
0x00C8000,
@@ -333,7 +333,7 @@ static int __init mc32_probe1(struct net_device *dev, int slot)
0x00D8000,
0x00DC000
};
- static char *failures[]={
+ static const char * const failures[] = {
"Processor instruction",
"Processor data bus",
"Processor data bus",
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 05/62] at1700: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (3 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 04/62] 3c527: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 06/62] benet: " Joe Perches
` (52 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
9083 370 2232 11685 2da5 drivers/net/at1700.o.new
9167 370 2232 11769 2df9 drivers/net/at1700.o.old
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/at1700.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index 871b163..f4744fc 100644
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -270,9 +270,9 @@ static const struct net_device_ops at1700_netdev_ops = {
static int __init at1700_probe1(struct net_device *dev, int ioaddr)
{
- char fmv_irqmap[4] = {3, 7, 10, 15};
- char fmv_irqmap_pnp[8] = {3, 4, 5, 7, 9, 10, 11, 15};
- char at1700_irqmap[8] = {3, 4, 5, 9, 10, 11, 14, 15};
+ static const char fmv_irqmap[4] = {3, 7, 10, 15};
+ static const char fmv_irqmap_pnp[8] = {3, 4, 5, 7, 9, 10, 11, 15};
+ static const char at1700_irqmap[8] = {3, 4, 5, 9, 10, 11, 14, 15};
unsigned int i, irq, is_fmv18x = 0, is_at1700 = 0;
int slot, ret = -ENODEV;
struct net_local *lp = netdev_priv(dev);
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 06/62] benet: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (4 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 05/62] at1700: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 07/62] bnx2: " Joe Perches
` (51 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Sathya Perla, Subbu Seetharaman, Sarveshwar Bandi, Ajit Khaparde
Cc: netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
9920 56 1248 11224 2bd8 drivers/net/benet/be_ethtool.o.old
9839 56 1232 11127 2b77 drivers/net/benet/be_ethtool.o.new
38586 386 8624 47596 b9ec drivers/net/benet/be_main.o.old
38452 386 8624 47462 b966 drivers/net/benet/be_main.o.new
Use ARRAY_SIZE not magic numbers.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/benet/be_ethtool.c | 4 +++-
drivers/net/benet/be_main.c | 10 +++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c
index 0f46366..b4be027 100644
--- a/drivers/net/benet/be_ethtool.c
+++ b/drivers/net/benet/be_ethtool.c
@@ -549,7 +549,9 @@ be_test_ddr_dma(struct be_adapter *adapter)
{
int ret, i;
struct be_dma_mem ddrdma_cmd;
- u64 pattern[2] = {0x5a5a5a5a5a5a5a5aULL, 0xa5a5a5a5a5a5a5a5ULL};
+ static const u64 pattern[2] = {
+ 0x5a5a5a5a5a5a5a5aULL, 0xa5a5a5a5a5a5a5a5ULL
+ };
ddrdma_cmd.size = sizeof(struct be_cmd_req_ddrdma_test);
ddrdma_cmd.va = pci_alloc_consistent(adapter->pdev, ddrdma_cmd.size,
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index c36cd2f..a112b75 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -2343,10 +2343,10 @@ static int be_flash_data(struct be_adapter *adapter,
int num_bytes;
const u8 *p = fw->data;
struct be_cmd_write_flashrom *req = flash_cmd->va;
- struct flash_comp *pflashcomp;
+ const struct flash_comp *pflashcomp;
int num_comp;
- struct flash_comp gen3_flash_types[9] = {
+ static const struct flash_comp gen3_flash_types[9] = {
{ FLASH_iSCSI_PRIMARY_IMAGE_START_g3, IMG_TYPE_ISCSI_ACTIVE,
FLASH_IMAGE_MAX_SIZE_g3},
{ FLASH_REDBOOT_START_g3, IMG_TYPE_REDBOOT,
@@ -2366,7 +2366,7 @@ static int be_flash_data(struct be_adapter *adapter,
{ FLASH_NCSI_START_g3, IMG_TYPE_NCSI_FW,
FLASH_NCSI_IMAGE_MAX_SIZE_g3}
};
- struct flash_comp gen2_flash_types[8] = {
+ static const struct flash_comp gen2_flash_types[8] = {
{ FLASH_iSCSI_PRIMARY_IMAGE_START_g2, IMG_TYPE_ISCSI_ACTIVE,
FLASH_IMAGE_MAX_SIZE_g2},
{ FLASH_REDBOOT_START_g2, IMG_TYPE_REDBOOT,
@@ -2388,11 +2388,11 @@ static int be_flash_data(struct be_adapter *adapter,
if (adapter->generation == BE_GEN3) {
pflashcomp = gen3_flash_types;
filehdr_size = sizeof(struct flash_file_hdr_g3);
- num_comp = 9;
+ num_comp = ARRAY_SIZE(gen3_flash_types);
} else {
pflashcomp = gen2_flash_types;
filehdr_size = sizeof(struct flash_file_hdr_g2);
- num_comp = 8;
+ num_comp = ARRAY_SIZE(gen2_flash_types);
}
for (i = 0; i < num_comp; i++) {
if ((pflashcomp[i].optype == IMG_TYPE_NCSI_FW) &&
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 07/62] bnx2: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (5 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 06/62] benet: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 08/62] bnx2x: " Joe Perches
` (50 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Michael Chan; +Cc: netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
92097 560 22488 115145 1c1c9 drivers/net/bnx2.o.new
92133 560 22488 115181 1c1ed drivers/net/bnx2.o.old
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/bnx2.c | 46 ++++++++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 062600b..7805a4b 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -6801,28 +6801,30 @@ bnx2_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *_p)
u32 *p = _p, i, offset;
u8 *orig_p = _p;
struct bnx2 *bp = netdev_priv(dev);
- u32 reg_boundaries[] = { 0x0000, 0x0098, 0x0400, 0x045c,
- 0x0800, 0x0880, 0x0c00, 0x0c10,
- 0x0c30, 0x0d08, 0x1000, 0x101c,
- 0x1040, 0x1048, 0x1080, 0x10a4,
- 0x1400, 0x1490, 0x1498, 0x14f0,
- 0x1500, 0x155c, 0x1580, 0x15dc,
- 0x1600, 0x1658, 0x1680, 0x16d8,
- 0x1800, 0x1820, 0x1840, 0x1854,
- 0x1880, 0x1894, 0x1900, 0x1984,
- 0x1c00, 0x1c0c, 0x1c40, 0x1c54,
- 0x1c80, 0x1c94, 0x1d00, 0x1d84,
- 0x2000, 0x2030, 0x23c0, 0x2400,
- 0x2800, 0x2820, 0x2830, 0x2850,
- 0x2b40, 0x2c10, 0x2fc0, 0x3058,
- 0x3c00, 0x3c94, 0x4000, 0x4010,
- 0x4080, 0x4090, 0x43c0, 0x4458,
- 0x4c00, 0x4c18, 0x4c40, 0x4c54,
- 0x4fc0, 0x5010, 0x53c0, 0x5444,
- 0x5c00, 0x5c18, 0x5c80, 0x5c90,
- 0x5fc0, 0x6000, 0x6400, 0x6428,
- 0x6800, 0x6848, 0x684c, 0x6860,
- 0x6888, 0x6910, 0x8000 };
+ static const u32 reg_boundaries[] = {
+ 0x0000, 0x0098, 0x0400, 0x045c,
+ 0x0800, 0x0880, 0x0c00, 0x0c10,
+ 0x0c30, 0x0d08, 0x1000, 0x101c,
+ 0x1040, 0x1048, 0x1080, 0x10a4,
+ 0x1400, 0x1490, 0x1498, 0x14f0,
+ 0x1500, 0x155c, 0x1580, 0x15dc,
+ 0x1600, 0x1658, 0x1680, 0x16d8,
+ 0x1800, 0x1820, 0x1840, 0x1854,
+ 0x1880, 0x1894, 0x1900, 0x1984,
+ 0x1c00, 0x1c0c, 0x1c40, 0x1c54,
+ 0x1c80, 0x1c94, 0x1d00, 0x1d84,
+ 0x2000, 0x2030, 0x23c0, 0x2400,
+ 0x2800, 0x2820, 0x2830, 0x2850,
+ 0x2b40, 0x2c10, 0x2fc0, 0x3058,
+ 0x3c00, 0x3c94, 0x4000, 0x4010,
+ 0x4080, 0x4090, 0x43c0, 0x4458,
+ 0x4c00, 0x4c18, 0x4c40, 0x4c54,
+ 0x4fc0, 0x5010, 0x53c0, 0x5444,
+ 0x5c00, 0x5c18, 0x5c80, 0x5c90,
+ 0x5fc0, 0x6000, 0x6400, 0x6428,
+ 0x6800, 0x6848, 0x684c, 0x6860,
+ 0x6888, 0x6910, 0x8000
+ };
regs->version = 0;
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 08/62] bnx2x: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (6 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 07/62] bnx2: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 09/62] can: " Joe Perches
` (49 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Eilon Greenstein; +Cc: netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
147632 349 34240 182221 2c7cd drivers/net/bnx2x/bnx2x_main.o.old
147588 349 34240 182177 2c7a1 drivers/net/bnx2x/bnx2x_main.o.new
Changed bnx2x_set_mac_addr_gen to use const *
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/bnx2x/bnx2x_main.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/bnx2x/bnx2x_main.c b/drivers/net/bnx2x/bnx2x_main.c
index 2a50231..fbcffc6 100644
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
@@ -6055,7 +6055,7 @@ static int bnx2x_func_stop(struct bnx2x *bp)
* @param cam_offset offset in a CAM to use
* @param is_bcast is the set MAC a broadcast address (for E1 only)
*/
-static void bnx2x_set_mac_addr_gen(struct bnx2x *bp, int set, u8 *mac,
+static void bnx2x_set_mac_addr_gen(struct bnx2x *bp, int set, const u8 *mac,
u32 cl_bit_vec, u8 cam_offset,
u8 is_bcast)
{
@@ -6181,7 +6181,9 @@ void bnx2x_set_eth_mac(struct bnx2x *bp, int set)
if (CHIP_IS_E1(bp)) {
/* broadcast MAC */
- u8 bcast[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+ static const u8 bcast[ETH_ALEN] = {
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+ };
bnx2x_set_mac_addr_gen(bp, set, bcast, 0, cam_offset + 1, 1);
}
}
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 09/62] can: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (7 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 08/62] bnx2x: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 10/62] chelsio: " Joe Perches
` (48 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: netdev; +Cc: Wolfgang Grandegger, socketcan-core, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
4399 604 1160 6163 1813 drivers/net/can/sja1000/plx_pci.o.old
4396 604 1160 6160 1810 drivers/net/can/sja1000/plx_pci.o.new
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/can/sja1000/plx_pci.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/can/sja1000/plx_pci.c b/drivers/net/can/sja1000/plx_pci.c
index 437b5c7..231385b 100644
--- a/drivers/net/can/sja1000/plx_pci.c
+++ b/drivers/net/can/sja1000/plx_pci.c
@@ -383,7 +383,7 @@ static void plx_pci_reset_marathon(struct pci_dev *pdev)
{
void __iomem *reset_addr;
int i;
- int reset_bar[2] = {3, 5};
+ static const int reset_bar[2] = {3, 5};
plx_pci_reset_common(pdev);
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 10/62] chelsio: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (8 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 09/62] can: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 11/62] cxgb3: " Joe Perches
` (47 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel
Moved duplicated ch_mac_addr declarations to single static const file scope.
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
21712 305 5168 27185 6a31 drivers/net/chelsio/sge.o.new
21806 305 5168 27279 6a8f drivers/net/chelsio/sge.o.old
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/chelsio/sge.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c
index 70221ca..f778b15 100644
--- a/drivers/net/chelsio/sge.c
+++ b/drivers/net/chelsio/sge.c
@@ -273,6 +273,10 @@ struct sge {
struct cmdQ cmdQ[SGE_CMDQ_N] ____cacheline_aligned_in_smp;
};
+static const u8 ch_mac_addr[ETH_ALEN] = {
+ 0x0, 0x7, 0x43, 0x0, 0x0, 0x0
+};
+
/*
* stop tasklet and free all pending skb's
*/
@@ -2012,10 +2016,6 @@ static void espibug_workaround_t204(unsigned long data)
continue;
if (!skb->cb[0]) {
- u8 ch_mac_addr[ETH_ALEN] = {
- 0x0, 0x7, 0x43, 0x0, 0x0, 0x0
- };
-
skb_copy_to_linear_data_offset(skb,
sizeof(struct cpl_tx_pkt),
ch_mac_addr,
@@ -2048,8 +2048,6 @@ static void espibug_workaround(unsigned long data)
if ((seop & 0xfff0fff) == 0xfff && skb) {
if (!skb->cb[0]) {
- u8 ch_mac_addr[ETH_ALEN] =
- {0x0, 0x7, 0x43, 0x0, 0x0, 0x0};
skb_copy_to_linear_data_offset(skb,
sizeof(struct cpl_tx_pkt),
ch_mac_addr,
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 11/62] cxgb3: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (9 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 10/62] chelsio: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 12/62] " Joe Perches
` (46 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Divy Le Ray; +Cc: netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
8401 368 2008 10777 2a19 drivers/net/cxgb3/ael1002.o.new
8129 680 2008 10817 2a41 drivers/net/cxgb3/ael1002.o.old
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/cxgb3/ael1002.c | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/net/cxgb3/ael1002.c b/drivers/net/cxgb3/ael1002.c
index 35cd367..2028da9 100644
--- a/drivers/net/cxgb3/ael1002.c
+++ b/drivers/net/cxgb3/ael1002.c
@@ -292,7 +292,7 @@ unknown:
*/
static int ael2005_setup_sr_edc(struct cphy *phy)
{
- static struct reg_val regs[] = {
+ static const struct reg_val regs[] = {
{ MDIO_MMD_PMAPMD, 0xc003, 0xffff, 0x181 },
{ MDIO_MMD_PMAPMD, 0xc010, 0xffff, 0x448a },
{ MDIO_MMD_PMAPMD, 0xc04a, 0xffff, 0x5200 },
@@ -324,11 +324,11 @@ static int ael2005_setup_sr_edc(struct cphy *phy)
static int ael2005_setup_twinax_edc(struct cphy *phy, int modtype)
{
- static struct reg_val regs[] = {
+ static const struct reg_val regs[] = {
{ MDIO_MMD_PMAPMD, 0xc04a, 0xffff, 0x5a00 },
{ 0, 0, 0, 0 }
};
- static struct reg_val preemphasis[] = {
+ static const struct reg_val preemphasis[] = {
{ MDIO_MMD_PMAPMD, 0xc014, 0xffff, 0xfe16 },
{ MDIO_MMD_PMAPMD, 0xc015, 0xffff, 0xa000 },
{ 0, 0, 0, 0 }
@@ -393,7 +393,7 @@ static int ael2005_intr_clear(struct cphy *phy)
static int ael2005_reset(struct cphy *phy, int wait)
{
- static struct reg_val regs0[] = {
+ static const struct reg_val regs0[] = {
{ MDIO_MMD_PMAPMD, 0xc001, 0, 1 << 5 },
{ MDIO_MMD_PMAPMD, 0xc017, 0, 1 << 5 },
{ MDIO_MMD_PMAPMD, 0xc013, 0xffff, 0xf341 },
@@ -403,7 +403,7 @@ static int ael2005_reset(struct cphy *phy, int wait)
{ MDIO_MMD_PMAPMD, 0xc210, 0xffff, 0 },
{ 0, 0, 0, 0 }
};
- static struct reg_val regs1[] = {
+ static const struct reg_val regs1[] = {
{ MDIO_MMD_PMAPMD, 0xca00, 0xffff, 0x0080 },
{ MDIO_MMD_PMAPMD, 0xca12, 0xffff, 0 },
{ 0, 0, 0, 0 }
@@ -522,7 +522,7 @@ int t3_ael2005_phy_prep(struct cphy *phy, struct adapter *adapter,
*/
static int ael2020_setup_sr_edc(struct cphy *phy)
{
- static struct reg_val regs[] = {
+ static const struct reg_val regs[] = {
/* set CDR offset to 10 */
{ MDIO_MMD_PMAPMD, 0xcc01, 0xffff, 0x488a },
@@ -551,20 +551,20 @@ static int ael2020_setup_sr_edc(struct cphy *phy)
static int ael2020_setup_twinax_edc(struct cphy *phy, int modtype)
{
/* set uC to 40MHz */
- static struct reg_val uCclock40MHz[] = {
+ static const struct reg_val uCclock40MHz[] = {
{ MDIO_MMD_PMAPMD, 0xff28, 0xffff, 0x4001 },
{ MDIO_MMD_PMAPMD, 0xff2a, 0xffff, 0x0002 },
{ 0, 0, 0, 0 }
};
/* activate uC clock */
- static struct reg_val uCclockActivate[] = {
+ static const struct reg_val uCclockActivate[] = {
{ MDIO_MMD_PMAPMD, 0xd000, 0xffff, 0x5200 },
{ 0, 0, 0, 0 }
};
/* set PC to start of SRAM and activate uC */
- static struct reg_val uCactivate[] = {
+ static const struct reg_val uCactivate[] = {
{ MDIO_MMD_PMAPMD, 0xd080, 0xffff, 0x0100 },
{ MDIO_MMD_PMAPMD, 0xd092, 0xffff, 0x0000 },
{ 0, 0, 0, 0 }
@@ -624,7 +624,7 @@ static int ael2020_get_module_type(struct cphy *phy, int delay_ms)
*/
static int ael2020_intr_enable(struct cphy *phy)
{
- struct reg_val regs[] = {
+ static const struct reg_val regs[] = {
/* output Module's Loss Of Signal (LOS) to LED */
{ MDIO_MMD_PMAPMD, AEL2020_GPIO_CFG+AEL2020_GPIO_LSTAT,
0xffff, 0x4 },
@@ -664,7 +664,7 @@ static int ael2020_intr_enable(struct cphy *phy)
*/
static int ael2020_intr_disable(struct cphy *phy)
{
- struct reg_val regs[] = {
+ static const struct reg_val regs[] = {
/* reset "link status" LED to "off" */
{ MDIO_MMD_PMAPMD, AEL2020_GPIO_CTRL,
0xffff, 0xb << (AEL2020_GPIO_LSTAT*4) },
@@ -701,7 +701,7 @@ static int ael2020_intr_clear(struct cphy *phy)
return err ? err : t3_phy_lasi_intr_clear(phy);
}
-static struct reg_val ael2020_reset_regs[] = {
+static const struct reg_val ael2020_reset_regs[] = {
/* Erratum #2: CDRLOL asserted, causing PMA link down status */
{ MDIO_MMD_PMAPMD, 0xc003, 0xffff, 0x3101 },
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 12/62] cxgb3: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (10 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 11/62] cxgb3: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 13/62] cxgb4: " Joe Perches
` (45 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Divy Le Ray; +Cc: netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
42246 56 8816 51118 c7ae drivers/net/cxgb3/t3_hw.o.new
42198 104 8816 51118 c7ae drivers/net/cxgb3/t3_hw.o.old
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/cxgb3/t3_hw.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index 0b19704..d55db6b 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -1562,7 +1562,7 @@ static void tp_intr_handler(struct adapter *adapter)
{0}
};
- static struct intr_info tp_intr_info_t3c[] = {
+ static const struct intr_info tp_intr_info_t3c[] = {
{0x1fffffff, "TP parity error", -1, 1},
{F_FLMRXFLSTEMPTY, "TP out of Rx pages", -1, 1},
{F_FLMTXFLSTEMPTY, "TP out of Tx pages", -1, 1},
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 13/62] cxgb4: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (11 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 12/62] " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 14/62] cxgb4vf: " Joe Perches
` (44 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Dimitris Michailidis; +Cc: netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
30668 2168 5960 38796 978c drivers/net/cxgb4/t4_hw.o.old
32780 56 5960 38796 978c drivers/net/cxgb4/t4_hw.o.new
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/cxgb4/t4_hw.c | 48 ++++++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/drivers/net/cxgb4/t4_hw.c b/drivers/net/cxgb4/t4_hw.c
index bb813d9..1bf6614 100644
--- a/drivers/net/cxgb4/t4_hw.c
+++ b/drivers/net/cxgb4/t4_hw.c
@@ -183,7 +183,7 @@ static void dump_mbox(struct adapter *adap, int mbox, u32 data_reg)
int t4_wr_mbox_meat(struct adapter *adap, int mbox, const void *cmd, int size,
void *rpl, bool sleep_ok)
{
- static int delay[] = {
+ static const int delay[] = {
1, 1, 3, 5, 10, 10, 20, 50, 100, 200
};
@@ -919,7 +919,7 @@ static int t4_handle_intr_status(struct adapter *adapter, unsigned int reg,
*/
static void pcie_intr_handler(struct adapter *adapter)
{
- static struct intr_info sysbus_intr_info[] = {
+ static const struct intr_info sysbus_intr_info[] = {
{ RNPP, "RXNP array parity error", -1, 1 },
{ RPCP, "RXPC array parity error", -1, 1 },
{ RCIP, "RXCIF array parity error", -1, 1 },
@@ -927,7 +927,7 @@ static void pcie_intr_handler(struct adapter *adapter)
{ RFTP, "RXFT array parity error", -1, 1 },
{ 0 }
};
- static struct intr_info pcie_port_intr_info[] = {
+ static const struct intr_info pcie_port_intr_info[] = {
{ TPCP, "TXPC array parity error", -1, 1 },
{ TNPP, "TXNP array parity error", -1, 1 },
{ TFTP, "TXFT array parity error", -1, 1 },
@@ -939,7 +939,7 @@ static void pcie_intr_handler(struct adapter *adapter)
{ TDUE, "Tx uncorrectable data error", -1, 1 },
{ 0 }
};
- static struct intr_info pcie_intr_info[] = {
+ static const struct intr_info pcie_intr_info[] = {
{ MSIADDRLPERR, "MSI AddrL parity error", -1, 1 },
{ MSIADDRHPERR, "MSI AddrH parity error", -1, 1 },
{ MSIDATAPERR, "MSI data parity error", -1, 1 },
@@ -991,7 +991,7 @@ static void pcie_intr_handler(struct adapter *adapter)
*/
static void tp_intr_handler(struct adapter *adapter)
{
- static struct intr_info tp_intr_info[] = {
+ static const struct intr_info tp_intr_info[] = {
{ 0x3fffffff, "TP parity error", -1, 1 },
{ FLMTXFLSTEMPTY, "TP out of Tx pages", -1, 1 },
{ 0 }
@@ -1008,7 +1008,7 @@ static void sge_intr_handler(struct adapter *adapter)
{
u64 v;
- static struct intr_info sge_intr_info[] = {
+ static const struct intr_info sge_intr_info[] = {
{ ERR_CPL_EXCEED_IQE_SIZE,
"SGE received CPL exceeding IQE size", -1, 1 },
{ ERR_INVALID_CIDX_INC,
@@ -1053,7 +1053,7 @@ static void sge_intr_handler(struct adapter *adapter)
*/
static void cim_intr_handler(struct adapter *adapter)
{
- static struct intr_info cim_intr_info[] = {
+ static const struct intr_info cim_intr_info[] = {
{ PREFDROPINT, "CIM control register prefetch drop", -1, 1 },
{ OBQPARERR, "CIM OBQ parity error", -1, 1 },
{ IBQPARERR, "CIM IBQ parity error", -1, 1 },
@@ -1063,7 +1063,7 @@ static void cim_intr_handler(struct adapter *adapter)
{ TIEQOUTPARERRINT, "CIM TIEQ incoming parity error", -1, 1 },
{ 0 }
};
- static struct intr_info cim_upintr_info[] = {
+ static const struct intr_info cim_upintr_info[] = {
{ RSVDSPACEINT, "CIM reserved space access", -1, 1 },
{ ILLTRANSINT, "CIM illegal transaction", -1, 1 },
{ ILLWRINT, "CIM illegal write", -1, 1 },
@@ -1110,7 +1110,7 @@ static void cim_intr_handler(struct adapter *adapter)
*/
static void ulprx_intr_handler(struct adapter *adapter)
{
- static struct intr_info ulprx_intr_info[] = {
+ static const struct intr_info ulprx_intr_info[] = {
{ 0x1800000, "ULPRX context error", -1, 1 },
{ 0x7fffff, "ULPRX parity error", -1, 1 },
{ 0 }
@@ -1125,7 +1125,7 @@ static void ulprx_intr_handler(struct adapter *adapter)
*/
static void ulptx_intr_handler(struct adapter *adapter)
{
- static struct intr_info ulptx_intr_info[] = {
+ static const struct intr_info ulptx_intr_info[] = {
{ PBL_BOUND_ERR_CH3, "ULPTX channel 3 PBL out of bounds", -1,
0 },
{ PBL_BOUND_ERR_CH2, "ULPTX channel 2 PBL out of bounds", -1,
@@ -1147,7 +1147,7 @@ static void ulptx_intr_handler(struct adapter *adapter)
*/
static void pmtx_intr_handler(struct adapter *adapter)
{
- static struct intr_info pmtx_intr_info[] = {
+ static const struct intr_info pmtx_intr_info[] = {
{ PCMD_LEN_OVFL0, "PMTX channel 0 pcmd too large", -1, 1 },
{ PCMD_LEN_OVFL1, "PMTX channel 1 pcmd too large", -1, 1 },
{ PCMD_LEN_OVFL2, "PMTX channel 2 pcmd too large", -1, 1 },
@@ -1169,7 +1169,7 @@ static void pmtx_intr_handler(struct adapter *adapter)
*/
static void pmrx_intr_handler(struct adapter *adapter)
{
- static struct intr_info pmrx_intr_info[] = {
+ static const struct intr_info pmrx_intr_info[] = {
{ ZERO_E_CMD_ERROR, "PMRX 0-length pcmd", -1, 1 },
{ PMRX_FRAMING_ERROR, "PMRX framing error", -1, 1 },
{ OCSPI_PAR_ERROR, "PMRX ocspi parity error", -1, 1 },
@@ -1188,7 +1188,7 @@ static void pmrx_intr_handler(struct adapter *adapter)
*/
static void cplsw_intr_handler(struct adapter *adapter)
{
- static struct intr_info cplsw_intr_info[] = {
+ static const struct intr_info cplsw_intr_info[] = {
{ CIM_OP_MAP_PERR, "CPLSW CIM op_map parity error", -1, 1 },
{ CIM_OVFL_ERROR, "CPLSW CIM overflow", -1, 1 },
{ TP_FRAMING_ERROR, "CPLSW TP framing error", -1, 1 },
@@ -1207,7 +1207,7 @@ static void cplsw_intr_handler(struct adapter *adapter)
*/
static void le_intr_handler(struct adapter *adap)
{
- static struct intr_info le_intr_info[] = {
+ static const struct intr_info le_intr_info[] = {
{ LIPMISS, "LE LIP miss", -1, 0 },
{ LIP0, "LE 0 LIP error", -1, 0 },
{ PARITYERR, "LE parity error", -1, 1 },
@@ -1225,11 +1225,11 @@ static void le_intr_handler(struct adapter *adap)
*/
static void mps_intr_handler(struct adapter *adapter)
{
- static struct intr_info mps_rx_intr_info[] = {
+ static const struct intr_info mps_rx_intr_info[] = {
{ 0xffffff, "MPS Rx parity error", -1, 1 },
{ 0 }
};
- static struct intr_info mps_tx_intr_info[] = {
+ static const struct intr_info mps_tx_intr_info[] = {
{ TPFIFO, "MPS Tx TP FIFO parity error", -1, 1 },
{ NCSIFIFO, "MPS Tx NC-SI FIFO parity error", -1, 1 },
{ TXDATAFIFO, "MPS Tx data FIFO parity error", -1, 1 },
@@ -1239,25 +1239,25 @@ static void mps_intr_handler(struct adapter *adapter)
{ FRMERR, "MPS Tx framing error", -1, 1 },
{ 0 }
};
- static struct intr_info mps_trc_intr_info[] = {
+ static const struct intr_info mps_trc_intr_info[] = {
{ FILTMEM, "MPS TRC filter parity error", -1, 1 },
{ PKTFIFO, "MPS TRC packet FIFO parity error", -1, 1 },
{ MISCPERR, "MPS TRC misc parity error", -1, 1 },
{ 0 }
};
- static struct intr_info mps_stat_sram_intr_info[] = {
+ static const struct intr_info mps_stat_sram_intr_info[] = {
{ 0x1fffff, "MPS statistics SRAM parity error", -1, 1 },
{ 0 }
};
- static struct intr_info mps_stat_tx_intr_info[] = {
+ static const struct intr_info mps_stat_tx_intr_info[] = {
{ 0xfffff, "MPS statistics Tx FIFO parity error", -1, 1 },
{ 0 }
};
- static struct intr_info mps_stat_rx_intr_info[] = {
+ static const struct intr_info mps_stat_rx_intr_info[] = {
{ 0xffffff, "MPS statistics Rx FIFO parity error", -1, 1 },
{ 0 }
};
- static struct intr_info mps_cls_intr_info[] = {
+ static const struct intr_info mps_cls_intr_info[] = {
{ MATCHSRAM, "MPS match SRAM parity error", -1, 1 },
{ MATCHTCAM, "MPS match TCAM parity error", -1, 1 },
{ HASHSRAM, "MPS hash SRAM parity error", -1, 1 },
@@ -1356,7 +1356,7 @@ static void ma_intr_handler(struct adapter *adap)
*/
static void smb_intr_handler(struct adapter *adap)
{
- static struct intr_info smb_intr_info[] = {
+ static const struct intr_info smb_intr_info[] = {
{ MSTTXFIFOPARINT, "SMB master Tx FIFO parity error", -1, 1 },
{ MSTRXFIFOPARINT, "SMB master Rx FIFO parity error", -1, 1 },
{ SLVFIFOPARINT, "SMB slave FIFO parity error", -1, 1 },
@@ -1372,7 +1372,7 @@ static void smb_intr_handler(struct adapter *adap)
*/
static void ncsi_intr_handler(struct adapter *adap)
{
- static struct intr_info ncsi_intr_info[] = {
+ static const struct intr_info ncsi_intr_info[] = {
{ CIM_DM_PRTY_ERR, "NC-SI CIM parity error", -1, 1 },
{ MPS_DM_PRTY_ERR, "NC-SI MPS parity error", -1, 1 },
{ TXFIFO_PRTY_ERR, "NC-SI Tx FIFO parity error", -1, 1 },
@@ -1410,7 +1410,7 @@ static void xgmac_intr_handler(struct adapter *adap, int port)
*/
static void pl_intr_handler(struct adapter *adap)
{
- static struct intr_info pl_intr_info[] = {
+ static const struct intr_info pl_intr_info[] = {
{ FATALPERR, "T4 fatal parity error", -1, 1 },
{ PERRVFID, "PL VFID_MAP parity error", -1, 1 },
{ 0 }
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 14/62] cxgb4vf: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (12 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 13/62] cxgb4: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-22 17:42 ` Casey Leedom
2010-11-21 2:38 ` [PATCH 15/62] e1000: " Joe Perches
` (43 subsequent siblings)
57 siblings, 1 reply; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Casey Leedom; +Cc: netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
10179 56 2216 12451 30a3 drivers/net/cxgb4vf/t4vf_hw.o.new
10179 56 2216 12451 30a3 drivers/net/cxgb4vf/t4vf_hw.o.old
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/cxgb4vf/t4vf_hw.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/cxgb4vf/t4vf_hw.c b/drivers/net/cxgb4vf/t4vf_hw.c
index f7d7f97..daedf6e 100644
--- a/drivers/net/cxgb4vf/t4vf_hw.c
+++ b/drivers/net/cxgb4vf/t4vf_hw.c
@@ -116,7 +116,7 @@ static void dump_mbox(struct adapter *adapter, const char *tag, u32 mbox_data)
int t4vf_wr_mbox_core(struct adapter *adapter, const void *cmd, int size,
void *rpl, bool sleep_ok)
{
- static int delay[] = {
+ static const int delay[] = {
1, 1, 3, 5, 10, 10, 20, 50, 100
};
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* Re: [PATCH 14/62] cxgb4vf: Use static const
2010-11-21 2:38 ` [PATCH 14/62] cxgb4vf: " Joe Perches
@ 2010-11-22 17:42 ` Casey Leedom
0 siblings, 0 replies; 76+ messages in thread
From: Casey Leedom @ 2010-11-22 17:42 UTC (permalink / raw)
To: Joe Perches; +Cc: netdev, linux-kernel
| From: Joe Perches <joe@perches.com>
| Date: Saturday, November 20, 2010 06:38 pm
|
| Using static const generally increases object text and decreases data size.
| It also generally decreases overall object size.
|
| text data bss dec hex filename
| 10179 56 2216 12451 30a3 drivers/net/cxgb4vf/t4vf_hw.o.new
| 10179 56 2216 12451 30a3 drivers/net/cxgb4vf/t4vf_hw.o.old
|
| Signed-off-by: Joe Perches <joe@perches.com>
| ---
| drivers/net/cxgb4vf/t4vf_hw.c | 2 +-
| 1 files changed, 1 insertions(+), 1 deletions(-)
|
| diff --git a/drivers/net/cxgb4vf/t4vf_hw.c b/drivers/net/cxgb4vf/t4vf_hw.c
| index f7d7f97..daedf6e 100644
| --- a/drivers/net/cxgb4vf/t4vf_hw.c
| +++ b/drivers/net/cxgb4vf/t4vf_hw.c
| @@ -116,7 +116,7 @@ static void dump_mbox(struct adapter *adapter, const
| char *tag, u32 mbox_data) int t4vf_wr_mbox_core(struct adapter *adapter,
| const void *cmd, int size, void *rpl, bool sleep_ok)
| {
| - static int delay[] = {
| + static const int delay[] = {
| 1, 1, 3, 5, 10, 10, 20, 50, 100
| };
Looks okay to me. Thanks!
Casey
^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH 15/62] e1000: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (13 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 14/62] cxgb4vf: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 16/62] " Joe Perches
` (42 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Jeff Kirsher, Jesse Brandeburg, Bruce Allan, Carolyn Wyborny,
Don
Cc: e1000-devel, netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
74538 4296 19168 98002 17ed2 drivers/net/e1000/e1000_hw.o.old
74501 4296 19168 97965 17ead drivers/net/e1000/e1000_hw.o.new
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/e1000/e1000_hw.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/e1000/e1000_hw.c b/drivers/net/e1000/e1000_hw.c
index c7e242b6..c866ef0 100644
--- a/drivers/net/e1000/e1000_hw.c
+++ b/drivers/net/e1000/e1000_hw.c
@@ -4892,8 +4892,8 @@ static s32 e1000_get_cable_length(struct e1000_hw *hw, u16 *min_length,
} else if (hw->phy_type == e1000_phy_igp) { /* For IGP PHY */
u16 cur_agc_value;
u16 min_agc_value = IGP01E1000_AGC_LENGTH_TABLE_SIZE;
- u16 agc_reg_array[IGP01E1000_PHY_CHANNEL_NUM] =
- { IGP01E1000_PHY_AGC_A,
+ static const u16 agc_reg_array[IGP01E1000_PHY_CHANNEL_NUM] = {
+ IGP01E1000_PHY_AGC_A,
IGP01E1000_PHY_AGC_B,
IGP01E1000_PHY_AGC_C,
IGP01E1000_PHY_AGC_D
@@ -5071,8 +5071,8 @@ static s32 e1000_config_dsp_after_link_change(struct e1000_hw *hw, bool link_up)
{
s32 ret_val;
u16 phy_data, phy_saved_data, speed, duplex, i;
- u16 dsp_reg_array[IGP01E1000_PHY_CHANNEL_NUM] =
- { IGP01E1000_PHY_AGC_PARAM_A,
+ static const u16 dsp_reg_array[IGP01E1000_PHY_CHANNEL_NUM] = {
+ IGP01E1000_PHY_AGC_PARAM_A,
IGP01E1000_PHY_AGC_PARAM_B,
IGP01E1000_PHY_AGC_PARAM_C,
IGP01E1000_PHY_AGC_PARAM_D
--
1.7.3.2.245.g03276.dirty
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today
http://p.sf.net/sfu/msIE9-sfdev2dev
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 16/62] e1000: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (14 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 15/62] e1000: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 17/62] e1000e: " Joe Perches
` (41 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Jeff Kirsher, Jesse Brandeburg, Bruce Allan, Carolyn Wyborny,
Don
Cc: e1000-devel, netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
9083 1772 936 11791 2e0f drivers/net/e1000/e1000_param.o.new
9147 1772 936 11855 2e4f drivers/net/e1000/e1000_param.o.old
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/e1000/e1000_param.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/e1000/e1000_param.c
index 10d8d98..6ba2aee 100644
--- a/drivers/net/e1000/e1000_param.c
+++ b/drivers/net/e1000/e1000_param.c
@@ -352,12 +352,13 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)
}
{ /* Flow Control */
- struct e1000_opt_list fc_list[] =
- {{ E1000_FC_NONE, "Flow Control Disabled" },
- { E1000_FC_RX_PAUSE,"Flow Control Receive Only" },
- { E1000_FC_TX_PAUSE,"Flow Control Transmit Only" },
- { E1000_FC_FULL, "Flow Control Enabled" },
- { E1000_FC_DEFAULT, "Flow Control Hardware Default" }};
+ static const struct e1000_opt_list fc_list[] = {
+ { E1000_FC_NONE, "Flow Control Disabled" },
+ { E1000_FC_RX_PAUSE, "Flow Control Receive Only" },
+ { E1000_FC_TX_PAUSE, "Flow Control Transmit Only" },
+ { E1000_FC_FULL, "Flow Control Enabled" },
+ { E1000_FC_DEFAULT, "Flow Control Hardware Default" }
+ };
opt = (struct e1000_option) {
.type = list_option,
--
1.7.3.2.245.g03276.dirty
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today
http://p.sf.net/sfu/msIE9-sfdev2dev
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 17/62] e1000e: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (15 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 16/62] " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 18/62] e2100: " Joe Perches
` (40 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Jeff Kirsher, Jesse Brandeburg, Bruce Allan, Carolyn Wyborny,
Don
Cc: e1000-devel, netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
30847 1400 7088 39335 99a7 drivers/net/e1000e/phy.o.new
30861 1400 7088 39349 99b5 drivers/net/e1000e/phy.o.old
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/e1000e/phy.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/net/e1000e/phy.c b/drivers/net/e1000e/phy.c
index b9bff5b..a7ea4e7 100644
--- a/drivers/net/e1000e/phy.c
+++ b/drivers/net/e1000e/phy.c
@@ -1840,11 +1840,12 @@ s32 e1000e_get_cable_length_igp_2(struct e1000_hw *hw)
u16 phy_data, i, agc_value = 0;
u16 cur_agc_index, max_agc_index = 0;
u16 min_agc_index = IGP02E1000_CABLE_LENGTH_TABLE_SIZE - 1;
- u16 agc_reg_array[IGP02E1000_PHY_CHANNEL_NUM] =
- {IGP02E1000_PHY_AGC_A,
- IGP02E1000_PHY_AGC_B,
- IGP02E1000_PHY_AGC_C,
- IGP02E1000_PHY_AGC_D};
+ static const u16 agc_reg_array[IGP02E1000_PHY_CHANNEL_NUM] = {
+ IGP02E1000_PHY_AGC_A,
+ IGP02E1000_PHY_AGC_B,
+ IGP02E1000_PHY_AGC_C,
+ IGP02E1000_PHY_AGC_D
+ };
/* Read the AGC registers for all channels */
for (i = 0; i < IGP02E1000_PHY_CHANNEL_NUM; i++) {
--
1.7.3.2.245.g03276.dirty
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today
http://p.sf.net/sfu/msIE9-sfdev2dev
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 18/62] e2100: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (16 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 17/62] e1000e: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 19/62] eepro: " Joe Perches
` (39 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
3447 76 784 4307 10d3 drivers/net/e2100.o.old
3484 76 784 4344 10f8 drivers/net/e2100.o.new
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/e2100.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/e2100.c b/drivers/net/e2100.c
index 06e72fb..94ec973 100644
--- a/drivers/net/e2100.c
+++ b/drivers/net/e2100.c
@@ -216,7 +216,7 @@ static int __init e21_probe1(struct net_device *dev, int ioaddr)
printk(" %02X", station_addr[i]);
if (dev->irq < 2) {
- int irqlist[] = {15, 11, 10, 12, 5, 9, 3, 4};
+ static const int irqlist[] = {15, 11, 10, 12, 5, 9, 3, 4};
for (i = 0; i < ARRAY_SIZE(irqlist); i++)
if (request_irq (irqlist[i], NULL, 0, "bogus", NULL) != -EBUSY) {
dev->irq = irqlist[i];
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 19/62] eepro: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (17 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 18/62] e2100: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 20/62] eexpress: " Joe Perches
` (38 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
13007 97 3888 16992 4260 drivers/net/eepro.o.old
12969 97 3888 16954 423a drivers/net/eepro.o.new
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/eepro.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c
index 6fa4227..eb35951 100644
--- a/drivers/net/eepro.c
+++ b/drivers/net/eepro.c
@@ -891,12 +891,13 @@ err:
there is non-reboot way to recover if something goes wrong.
*/
-static char irqrmap[] = {-1,-1,0,1,-1,2,-1,-1,-1,0,3,4,-1,-1,-1,-1};
-static char irqrmap2[] = {-1,-1,4,0,1,2,-1,3,-1,4,5,6,7,-1,-1,-1};
+static const char irqrmap[] = {-1,-1,0,1,-1,2,-1,-1,-1,0,3,4,-1,-1,-1,-1};
+static const char irqrmap2[] = {-1,-1,4,0,1,2,-1,3,-1,4,5,6,7,-1,-1,-1};
static int eepro_grab_irq(struct net_device *dev)
{
- int irqlist[] = { 3, 4, 5, 7, 9, 10, 11, 12, 0 };
- int *irqp = irqlist, temp_reg, ioaddr = dev->base_addr;
+ static const int irqlist[] = { 3, 4, 5, 7, 9, 10, 11, 12, 0 };
+ const int *irqp = irqlist;
+ int temp_reg, ioaddr = dev->base_addr;
eepro_sw2bank1(ioaddr); /* be CAREFUL, BANK 1 now */
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 20/62] eexpress: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (18 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 19/62] eepro: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 21/62] gianfar: " Joe Perches
` (37 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Philip Blundell; +Cc: netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
20165 73 4400 24638 603e drivers/net/eexpress.o.new
20165 73 4400 24638 603e drivers/net/eexpress.o.old
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/eexpress.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c
index 12c37d2..48ee51b 100644
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
@@ -1103,7 +1103,7 @@ static int __init eexp_hw_probe(struct net_device *dev, unsigned short ioaddr)
dev->dev_addr[i] = ((unsigned char *)hw_addr)[5-i];
{
- static char irqmap[]={0, 9, 3, 4, 5, 10, 11, 0};
+ static const char irqmap[] = { 0, 9, 3, 4, 5, 10, 11, 0 };
unsigned short setupval = eexp_hw_readeeprom(ioaddr,0);
/* Use the IRQ from EEPROM if none was given */
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 21/62] gianfar: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (19 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 20/62] eexpress: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 22/62] hp: " Joe Perches
` (36 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
Changed gfar_set_mac_for_addr to take const *
Uncompiled.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/gianfar.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index d1bec62..45c4b7b 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -143,7 +143,8 @@ void gfar_halt(struct net_device *dev);
static void gfar_halt_nodisable(struct net_device *dev);
void gfar_start(struct net_device *dev);
static void gfar_clear_exact_match(struct net_device *dev);
-static void gfar_set_mac_for_addr(struct net_device *dev, int num, u8 *addr);
+static void gfar_set_mac_for_addr(struct net_device *dev, int num,
+ const u8 *addr);
static int gfar_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
MODULE_AUTHOR("Freescale Semiconductor, Inc");
@@ -3094,10 +3095,10 @@ static void gfar_set_multi(struct net_device *dev)
static void gfar_clear_exact_match(struct net_device *dev)
{
int idx;
- u8 zero_arr[MAC_ADDR_LEN] = {0,0,0,0,0,0};
+ static const u8 zero_arr[MAC_ADDR_LEN] = {0, 0, 0, 0, 0, 0};
for(idx = 1;idx < GFAR_EM_NUM + 1;idx++)
- gfar_set_mac_for_addr(dev, idx, (u8 *)zero_arr);
+ gfar_set_mac_for_addr(dev, idx, zero_arr);
}
/* Set the appropriate hash bit for the given addr */
@@ -3132,7 +3133,8 @@ static void gfar_set_hash_for_addr(struct net_device *dev, u8 *addr)
/* There are multiple MAC Address register pairs on some controllers
* This function sets the numth pair to a given address
*/
-static void gfar_set_mac_for_addr(struct net_device *dev, int num, u8 *addr)
+static void gfar_set_mac_for_addr(struct net_device *dev, int num,
+ const u8 *addr)
{
struct gfar_private *priv = netdev_priv(dev);
struct gfar __iomem *regs = priv->gfargrp[0].regs;
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 22/62] hp: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (20 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 21/62] gianfar: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 23/62] igb: " Joe Perches
` (35 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
4743 104 1256 6103 17d7 drivers/net/hp.o.new
4720 104 1256 6080 17c0 drivers/net/hp.o.old
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/hp.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/hp.c b/drivers/net/hp.c
index d15d2f2..ef20143 100644
--- a/drivers/net/hp.c
+++ b/drivers/net/hp.c
@@ -162,9 +162,9 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr)
/* Snarf the interrupt now. Someday this could be moved to open(). */
if (dev->irq < 2) {
- int irq_16list[] = { 11, 10, 5, 3, 4, 7, 9, 0};
- int irq_8list[] = { 7, 5, 3, 4, 9, 0};
- int *irqp = wordmode ? irq_16list : irq_8list;
+ static const int irq_16list[] = { 11, 10, 5, 3, 4, 7, 9, 0};
+ static const int irq_8list[] = { 7, 5, 3, 4, 9, 0};
+ const int *irqp = wordmode ? irq_16list : irq_8list;
do {
int irq = *irqp;
if (request_irq (irq, NULL, 0, "bogus", NULL) != -EBUSY) {
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 23/62] igb: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (21 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 22/62] hp: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 24/62] irda: " Joe Perches
` (34 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Jeff Kirsher, Jesse Brandeburg, Bruce Allan, Carolyn Wyborny,
Don
Cc: e1000-devel, netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
25448 1280 6176 32904 8088 drivers/net/igb/e1000_phy.o.new
25462 1280 6176 32918 8096 drivers/net/igb/e1000_phy.o.old
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/igb/e1000_phy.c | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/net/igb/e1000_phy.c b/drivers/net/igb/e1000_phy.c
index ddd036a..2dc089e 100644
--- a/drivers/net/igb/e1000_phy.c
+++ b/drivers/net/igb/e1000_phy.c
@@ -1757,11 +1757,12 @@ s32 igb_get_cable_length_igp_2(struct e1000_hw *hw)
u16 phy_data, i, agc_value = 0;
u16 cur_agc_index, max_agc_index = 0;
u16 min_agc_index = IGP02E1000_CABLE_LENGTH_TABLE_SIZE - 1;
- u16 agc_reg_array[IGP02E1000_PHY_CHANNEL_NUM] =
- {IGP02E1000_PHY_AGC_A,
- IGP02E1000_PHY_AGC_B,
- IGP02E1000_PHY_AGC_C,
- IGP02E1000_PHY_AGC_D};
+ static const u16 agc_reg_array[IGP02E1000_PHY_CHANNEL_NUM] = {
+ IGP02E1000_PHY_AGC_A,
+ IGP02E1000_PHY_AGC_B,
+ IGP02E1000_PHY_AGC_C,
+ IGP02E1000_PHY_AGC_D
+ };
/* Read the AGC registers for all channels */
for (i = 0; i < IGP02E1000_PHY_CHANNEL_NUM; i++) {
--
1.7.3.2.245.g03276.dirty
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today
http://p.sf.net/sfu/msIE9-sfdev2dev
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 24/62] irda: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (22 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 23/62] igb: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 25/62] " Joe Perches
` (33 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Samuel Ortiz; +Cc: netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
1540 100 320 1960 7a8 drivers/net/irda/act200l-sir.o.new
1597 100 320 2017 7e1 drivers/net/irda/act200l-sir.o.old
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/irda/act200l-sir.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/irda/act200l-sir.c b/drivers/net/irda/act200l-sir.c
index 37ab8c8..8ff084f 100644
--- a/drivers/net/irda/act200l-sir.c
+++ b/drivers/net/irda/act200l-sir.c
@@ -199,7 +199,7 @@ static int act200l_reset(struct sir_dev *dev)
{
unsigned state = dev->fsm.substate;
unsigned delay = 0;
- u8 control[9] = {
+ static const u8 control[9] = {
ACT200L_REG15,
ACT200L_REG13 | ACT200L_SHDW,
ACT200L_REG21 | ACT200L_EXCK | ACT200L_OSCL,
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 25/62] irda: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (23 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 24/62] irda: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 26/62] ixgbe: " Joe Perches
` (32 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Samuel Ortiz; +Cc: netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
16352 216 4424 20992 5200 drivers/net/irda/donauboe.o.old
16352 216 4424 20992 5200 drivers/net/irda/donauboe.o.new
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/irda/donauboe.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c
index b626ccc..f81d944 100644
--- a/drivers/net/irda/donauboe.c
+++ b/drivers/net/irda/donauboe.c
@@ -818,9 +818,9 @@ toshoboe_probe (struct toshoboe_cb *self)
{
int i, j, n;
#ifdef USE_MIR
- int bauds[] = { 9600, 115200, 4000000, 1152000 };
+ static const int bauds[] = { 9600, 115200, 4000000, 1152000 };
#else
- int bauds[] = { 9600, 115200, 4000000 };
+ static const int bauds[] = { 9600, 115200, 4000000 };
#endif
unsigned long flags;
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 26/62] ixgbe: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (24 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 25/62] " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 27/62] ixgbevf: " Joe Perches
` (31 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Jeff Kirsher, Jesse Brandeburg, Bruce Allan, Carolyn Wyborny,
Don
Cc: e1000-devel, netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
31444 56 6552 38052 94a4 drivers/net/ixgbe/ixgbe_ethtool.o.new
30905 560 6552 38017 9481 drivers/net/ixgbe/ixgbe_ethtool.o.old
Make single file scope definition for register_test_patterns.
Rename _test to register_test_patterns.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/ixgbe/ixgbe_ethtool.c | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index f9b5839..5b31775 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -1157,7 +1157,7 @@ struct ixgbe_reg_test {
#define TABLE64_TEST_HI 6
/* default 82599 register test */
-static struct ixgbe_reg_test reg_test_82599[] = {
+static const struct ixgbe_reg_test reg_test_82599[] = {
{ IXGBE_FCRTL_82599(0), 1, PATTERN_TEST, 0x8007FFF0, 0x8007FFF0 },
{ IXGBE_FCRTH_82599(0), 1, PATTERN_TEST, 0x8007FFF0, 0x8007FFF0 },
{ IXGBE_PFCTOP, 1, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
@@ -1181,7 +1181,7 @@ static struct ixgbe_reg_test reg_test_82599[] = {
};
/* default 82598 register test */
-static struct ixgbe_reg_test reg_test_82598[] = {
+static const struct ixgbe_reg_test reg_test_82598[] = {
{ IXGBE_FCRTL(0), 1, PATTERN_TEST, 0x8007FFF0, 0x8007FFF0 },
{ IXGBE_FCRTH(0), 1, PATTERN_TEST, 0x8007FFF0, 0x8007FFF0 },
{ IXGBE_PFCTOP, 1, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
@@ -1208,18 +1208,22 @@ static struct ixgbe_reg_test reg_test_82598[] = {
{ 0, 0, 0, 0 }
};
+static const u32 register_test_patterns[] = {
+ 0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF
+};
+
#define REG_PATTERN_TEST(R, M, W) \
{ \
u32 pat, val, before; \
- const u32 _test[] = {0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF}; \
- for (pat = 0; pat < ARRAY_SIZE(_test); pat++) { \
+ for (pat = 0; pat < ARRAY_SIZE(register_test_patterns); pat++) { \
before = readl(adapter->hw.hw_addr + R); \
- writel((_test[pat] & W), (adapter->hw.hw_addr + R)); \
+ writel((register_test_patterns[pat] & W), \
+ (adapter->hw.hw_addr + R)); \
val = readl(adapter->hw.hw_addr + R); \
- if (val != (_test[pat] & W & M)) { \
- e_err(drv, "pattern test reg %04X failed: got " \
+ if (val != (register_test_patterns[pat] & W & M)) { \
+ e_err(drv, "pattern test reg %04X failed: got " \
"0x%08X expected 0x%08X\n", \
- R, val, (_test[pat] & W & M)); \
+ R, val, (register_test_patterns[pat] & W & M)); \
*data = R; \
writel(before, adapter->hw.hw_addr + R); \
return 1; \
@@ -1246,7 +1250,7 @@ static struct ixgbe_reg_test reg_test_82598[] = {
static int ixgbe_reg_test(struct ixgbe_adapter *adapter, u64 *data)
{
- struct ixgbe_reg_test *test;
+ const struct ixgbe_reg_test *test;
u32 value, before, after;
u32 i, toggle;
--
1.7.3.2.245.g03276.dirty
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today
http://p.sf.net/sfu/msIE9-sfdev2dev
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 27/62] ixgbevf: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (25 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 26/62] ixgbe: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 28/62] ixgb: " Joe Perches
` (30 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Jeff Kirsher, Jesse Brandeburg, Bruce Allan, Carolyn Wyborny,
Don
Cc: e1000-devel, netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
8436 372 1728 10536 2928 drivers/net/ixgbevf/ethtool.o.old
8469 252 1728 10449 28d1 drivers/net/ixgbevf/ethtool.o.new
Make single file scope definition for register_test_patterns.
Rename _test to register_test_patterns.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/ixgbevf/ethtool.c | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ixgbevf/ethtool.c b/drivers/net/ixgbevf/ethtool.c
index 4cc817a..fa29b3c 100644
--- a/drivers/net/ixgbevf/ethtool.c
+++ b/drivers/net/ixgbevf/ethtool.c
@@ -544,7 +544,7 @@ struct ixgbevf_reg_test {
#define TABLE64_TEST_HI 6
/* default VF register test */
-static struct ixgbevf_reg_test reg_test_vf[] = {
+static const struct ixgbevf_reg_test reg_test_vf[] = {
{ IXGBE_VFRDBAL(0), 2, PATTERN_TEST, 0xFFFFFF80, 0xFFFFFF80 },
{ IXGBE_VFRDBAH(0), 2, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
{ IXGBE_VFRDLEN(0), 2, PATTERN_TEST, 0x000FFF80, 0x000FFFFF },
@@ -557,19 +557,23 @@ static struct ixgbevf_reg_test reg_test_vf[] = {
{ 0, 0, 0, 0 }
};
+static const u32 register_test_patterns[] = {
+ 0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF
+};
+
#define REG_PATTERN_TEST(R, M, W) \
{ \
u32 pat, val, before; \
- const u32 _test[] = {0x5A5A5A5A, 0xA5A5A5A5, 0x00000000, 0xFFFFFFFF}; \
- for (pat = 0; pat < ARRAY_SIZE(_test); pat++) { \
+ for (pat = 0; pat < ARRAY_SIZE(register_test_patterns); pat++) { \
before = readl(adapter->hw.hw_addr + R); \
- writel((_test[pat] & W), (adapter->hw.hw_addr + R)); \
+ writel((register_test_patterns[pat] & W), \
+ (adapter->hw.hw_addr + R)); \
val = readl(adapter->hw.hw_addr + R); \
- if (val != (_test[pat] & W & M)) { \
+ if (val != (register_test_patterns[pat] & W & M)) { \
hw_dbg(&adapter->hw, \
"pattern test reg %04X failed: got " \
"0x%08X expected 0x%08X\n", \
- R, val, (_test[pat] & W & M)); \
+ R, val, (register_test_patterns[pat] & W & M)); \
*data = R; \
writel(before, adapter->hw.hw_addr + R); \
return 1; \
@@ -596,7 +600,7 @@ static struct ixgbevf_reg_test reg_test_vf[] = {
static int ixgbevf_reg_test(struct ixgbevf_adapter *adapter, u64 *data)
{
- struct ixgbevf_reg_test *test;
+ const struct ixgbevf_reg_test *test;
u32 i;
test = reg_test_vf;
--
1.7.3.2.245.g03276.dirty
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today
http://p.sf.net/sfu/msIE9-sfdev2dev
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 28/62] ixgb: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (26 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 27/62] ixgbevf: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 29/62] jme: " Joe Perches
` (29 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Jeff Kirsher, Jesse Brandeburg, Bruce Allan, Carolyn Wyborny,
Don
Cc: e1000-devel, netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
4115 416 448 4979 1373 drivers/net/ixgb/ixgb_param.o.old
3998 416 448 4862 12fe drivers/net/ixgb/ixgb_param.o.new
Change struct ixgb_opt_list to const struct and
change char *str to const char *str.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/ixgb/ixgb_param.c | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ixgb/ixgb_param.c b/drivers/net/ixgb/ixgb_param.c
index 88a08f0..48765a1 100644
--- a/drivers/net/ixgb/ixgb_param.c
+++ b/drivers/net/ixgb/ixgb_param.c
@@ -191,9 +191,9 @@ struct ixgb_option {
} r;
struct { /* list_option info */
int nr;
- struct ixgb_opt_list {
+ const struct ixgb_opt_list {
int i;
- char *str;
+ const char *str;
} *p;
} l;
} arg;
@@ -226,7 +226,7 @@ ixgb_validate_option(unsigned int *value, const struct ixgb_option *opt)
break;
case list_option: {
int i;
- struct ixgb_opt_list *ent;
+ const struct ixgb_opt_list *ent;
for (i = 0; i < opt->arg.l.nr; i++) {
ent = &opt->arg.l.p[i];
@@ -322,14 +322,15 @@ ixgb_check_options(struct ixgb_adapter *adapter)
}
{ /* Flow Control */
- struct ixgb_opt_list fc_list[] =
- {{ ixgb_fc_none, "Flow Control Disabled" },
- { ixgb_fc_rx_pause,"Flow Control Receive Only" },
- { ixgb_fc_tx_pause,"Flow Control Transmit Only" },
- { ixgb_fc_full, "Flow Control Enabled" },
- { ixgb_fc_default, "Flow Control Hardware Default" }};
+ static const struct ixgb_opt_list fc_list[] = {
+ { ixgb_fc_none, "Flow Control Disabled" },
+ { ixgb_fc_rx_pause, "Flow Control Receive Only" },
+ { ixgb_fc_tx_pause, "Flow Control Transmit Only" },
+ { ixgb_fc_full, "Flow Control Enabled" },
+ { ixgb_fc_default, "Flow Control Hardware Default" }
+ };
- const struct ixgb_option opt = {
+ static const struct ixgb_option opt = {
.type = list_option,
.name = "Flow Control",
.err = "reading default settings from EEPROM",
--
1.7.3.2.245.g03276.dirty
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today
http://p.sf.net/sfu/msIE9-sfdev2dev
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 29/62] jme: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (27 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 28/62] ixgb: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 30/62] ksz884x: " Joe Perches
` (28 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Guo-Fu Tseng; +Cc: netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
38255 248 10408 48911 bf0f drivers/net/jme.o.new
38252 248 10408 48908 bf0c drivers/net/jme.o.old
Change jme_setup_wakeup_frame to take a const *.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/jme.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/jme.c b/drivers/net/jme.c
index c57d9a4..d6289fb 100644
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
@@ -135,7 +135,7 @@ jme_reset_phy_processor(struct jme_adapter *jme)
static void
jme_setup_wakeup_frame(struct jme_adapter *jme,
- u32 *mask, u32 crc, int fnr)
+ const u32 *mask, u32 crc, int fnr)
{
int i;
@@ -163,7 +163,7 @@ jme_setup_wakeup_frame(struct jme_adapter *jme,
static inline void
jme_reset_mac_processor(struct jme_adapter *jme)
{
- u32 mask[WAKEUP_FRAME_MASK_DWNR] = {0, 0, 0, 0};
+ static const u32 mask[WAKEUP_FRAME_MASK_DWNR] = {0, 0, 0, 0};
u32 crc = 0xCDCDCDCD;
u32 gpreg0;
int i;
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 30/62] ksz884x: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (28 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 29/62] jme: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 31/62] netxen: " Joe Perches
` (27 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
42018 1721 10204 53943 d2b7 drivers/net/ksz884x.o.new
42164 1721 10204 54089 d349 drivers/net/ksz884x.o.old
Changed some functions to take const u8 *.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/ksz884x.c | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ksz884x.c b/drivers/net/ksz884x.c
index 37504a3..49ea870 100644
--- a/drivers/net/ksz884x.c
+++ b/drivers/net/ksz884x.c
@@ -3570,7 +3570,7 @@ static void hw_cfg_wol(struct ksz_hw *hw, u16 frame, int set)
* This routine is used to program Wake-on-LAN pattern.
*/
static void hw_set_wol_frame(struct ksz_hw *hw, int i, uint mask_size,
- u8 *mask, uint frame_size, u8 *pattern)
+ const u8 *mask, uint frame_size, const u8 *pattern)
{
int bits;
int from;
@@ -3626,9 +3626,9 @@ static void hw_set_wol_frame(struct ksz_hw *hw, int i, uint mask_size,
*
* This routine is used to add ARP pattern for waking up the host.
*/
-static void hw_add_wol_arp(struct ksz_hw *hw, u8 *ip_addr)
+static void hw_add_wol_arp(struct ksz_hw *hw, const u8 *ip_addr)
{
- u8 mask[6] = { 0x3F, 0xF0, 0x3F, 0x00, 0xC0, 0x03 };
+ static const u8 mask[6] = { 0x3F, 0xF0, 0x3F, 0x00, 0xC0, 0x03 };
u8 pattern[42] = {
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -3651,8 +3651,8 @@ static void hw_add_wol_arp(struct ksz_hw *hw, u8 *ip_addr)
*/
static void hw_add_wol_bcast(struct ksz_hw *hw)
{
- u8 mask[] = { 0x3F };
- u8 pattern[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
+ static const u8 mask[] = { 0x3F };
+ static const u8 pattern[] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
hw_set_wol_frame(hw, 2, 1, mask, MAC_ADDR_LEN, pattern);
}
@@ -3669,7 +3669,7 @@ static void hw_add_wol_bcast(struct ksz_hw *hw)
*/
static void hw_add_wol_mcast(struct ksz_hw *hw)
{
- u8 mask[] = { 0x3F };
+ static const u8 mask[] = { 0x3F };
u8 pattern[] = { 0x33, 0x33, 0xFF, 0x00, 0x00, 0x00 };
memcpy(&pattern[3], &hw->override_addr[3], 3);
@@ -3687,7 +3687,7 @@ static void hw_add_wol_mcast(struct ksz_hw *hw)
*/
static void hw_add_wol_ucast(struct ksz_hw *hw)
{
- u8 mask[] = { 0x3F };
+ static const u8 mask[] = { 0x3F };
hw_set_wol_frame(hw, 0, 1, mask, MAC_ADDR_LEN, hw->override_addr);
}
@@ -3700,7 +3700,7 @@ static void hw_add_wol_ucast(struct ksz_hw *hw)
*
* This routine is used to enable Wake-on-LAN depending on driver settings.
*/
-static void hw_enable_wol(struct ksz_hw *hw, u32 wol_enable, u8 *net_addr)
+static void hw_enable_wol(struct ksz_hw *hw, u32 wol_enable, const u8 *net_addr)
{
hw_cfg_wol(hw, KS8841_WOL_MAGIC_ENABLE, (wol_enable & WAKE_MAGIC));
hw_cfg_wol(hw, KS8841_WOL_FRAME0_ENABLE, (wol_enable & WAKE_UCAST));
@@ -6208,7 +6208,7 @@ static int netdev_set_wol(struct net_device *dev,
struct dev_info *hw_priv = priv->adapter;
/* Need to find a way to retrieve the device IP address. */
- u8 net_addr[] = { 192, 168, 1, 1 };
+ static const u8 net_addr[] = { 192, 168, 1, 1 };
if (wol->wolopts & ~hw_priv->wol_support)
return -EINVAL;
@@ -7241,7 +7241,7 @@ static int pcidev_suspend(struct pci_dev *pdev, pm_message_t state)
struct ksz_hw *hw = &hw_priv->hw;
/* Need to find a way to retrieve the device IP address. */
- u8 net_addr[] = { 192, 168, 1, 1 };
+ static const u8 net_addr[] = { 192, 168, 1, 1 };
for (i = 0; i < hw->dev_count; i++) {
if (info->netdev[i]) {
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 31/62] netxen: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (29 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 30/62] ksz884x: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 32/62] ni52: " Joe Perches
` (26 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Amit Kumar Salecha; +Cc: netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
18658 16443 4312 39413 99f5 drivers/net/netxen/netxen_nic_hw.o.new
18714 16443 4312 39469 9a2d drivers/net/netxen/netxen_nic_hw.o.old
Changed nx_p3_nic_add_mac to take a const u8 *
Used ARRAY_SIZE instead of magic number.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/netxen/netxen_nic_hw.c | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index 37d3ebd..e42d26e 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -655,7 +655,7 @@ nx_p3_sre_macaddr_change(struct netxen_adapter *adapter, u8 *addr, unsigned op)
}
static int nx_p3_nic_add_mac(struct netxen_adapter *adapter,
- u8 *addr, struct list_head *del_list)
+ const u8 *addr, struct list_head *del_list)
{
struct list_head *head;
nx_mac_list_t *cur;
@@ -686,7 +686,9 @@ static void netxen_p3_nic_set_multi(struct net_device *netdev)
{
struct netxen_adapter *adapter = netdev_priv(netdev);
struct netdev_hw_addr *ha;
- u8 bcast_addr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+ static const u8 bcast_addr[ETH_ALEN] = {
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+ };
u32 mode = VPORT_MISS_MODE_DROP;
LIST_HEAD(del_list);
struct list_head *head;
@@ -869,9 +871,11 @@ int netxen_config_rss(struct netxen_adapter *adapter, int enable)
u64 word;
int i, rv;
- u64 key[] = { 0xbeac01fa6a42b73bULL, 0x8030f20c77cb2da3ULL,
- 0xae7b30b4d0ca2bcbULL, 0x43a38fb04167253dULL,
- 0x255b0ec26d5a56daULL };
+ static const u64 key[] = {
+ 0xbeac01fa6a42b73bULL, 0x8030f20c77cb2da3ULL,
+ 0xae7b30b4d0ca2bcbULL, 0x43a38fb04167253dULL,
+ 0x255b0ec26d5a56daULL
+ };
memset(&req, 0, sizeof(nx_nic_req_t));
@@ -895,7 +899,7 @@ int netxen_config_rss(struct netxen_adapter *adapter, int enable)
((u64)(enable & 0x1) << 8) |
((0x7ULL) << 48);
req.words[0] = cpu_to_le64(word);
- for (i = 0; i < 5; i++)
+ for (i = 0; i < ARRAY_SIZE(key); i++)
req.words[i+1] = cpu_to_le64(key[i]);
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 32/62] ni52: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (30 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 31/62] netxen: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 33/62] ni65: " Joe Perches
` (25 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
13787 89 3576 17452 442c drivers/net/ni52.o.old
13811 65 3576 17452 442c drivers/net/ni52.o.new
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/ni52.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c
index 33618edc..d973fc6 100644
--- a/drivers/net/ni52.c
+++ b/drivers/net/ni52.c
@@ -388,9 +388,9 @@ static long memend; /* e.g 0xd4000 */
struct net_device * __init ni52_probe(int unit)
{
struct net_device *dev = alloc_etherdev(sizeof(struct priv));
- static int ports[] = {0x300, 0x280, 0x360 , 0x320 , 0x340, 0};
+ static const int ports[] = {0x300, 0x280, 0x360, 0x320, 0x340, 0};
+ const int *port;
struct priv *p;
- int *port;
int err = 0;
if (!dev)
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 33/62] ni65: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (31 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 32/62] ni52: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 34/62] pcmcia: " Joe Perches
` (24 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
13234 187 3488 16909 420d drivers/net/ni65.o.old
13254 167 3488 16909 420d drivers/net/ni65.o.new
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/ni65.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ni65.c b/drivers/net/ni65.c
index da228a0..c75ae85 100644
--- a/drivers/net/ni65.c
+++ b/drivers/net/ni65.c
@@ -361,8 +361,8 @@ static int dma;
struct net_device * __init ni65_probe(int unit)
{
struct net_device *dev = alloc_etherdev(0);
- static int ports[] = {0x360,0x300,0x320,0x340, 0};
- int *port;
+ static const int ports[] = { 0x360, 0x300, 0x320, 0x340, 0 };
+ const int *port;
int err = 0;
if (!dev)
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 34/62] pcmcia: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (32 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 33/62] ni65: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 35/62] qlcnic: " Joe Perches
` (23 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
14697 1380 2768 18845 499d drivers/net/pcmcia/nmclan_cs.o.old
14697 1380 2768 18845 499d drivers/net/pcmcia/nmclan_cs.o.new
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/pcmcia/nmclan_cs.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c
index 0a2b0f9..76683d9 100644
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
@@ -1291,7 +1291,7 @@ updateCRC
static void updateCRC(int *CRC, int bit)
{
- int poly[]={
+ static const int poly[]={
1,1,1,0, 1,1,0,1,
1,0,1,1, 1,0,0,0,
1,0,0,0, 0,0,1,1,
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 35/62] qlcnic: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (33 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 34/62] pcmcia: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 36/62] qlge: " Joe Perches
` (22 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Amit Kumar Salecha, Anirban Chakraborty, linux-driver
Cc: netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
12250 16443 2824 31517 7b1d drivers/net/qlcnic/qlcnic_hw.o.new
12312 16443 2824 31579 7b5b drivers/net/qlcnic/qlcnic_hw.o.old
Changed qlcnic_nic_add_mac to take a const u8 *.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/qlcnic/qlcnic_hw.c | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/drivers/net/qlcnic/qlcnic_hw.c b/drivers/net/qlcnic/qlcnic_hw.c
index 7a47a2a..691e0d1 100644
--- a/drivers/net/qlcnic/qlcnic_hw.c
+++ b/drivers/net/qlcnic/qlcnic_hw.c
@@ -398,7 +398,7 @@ qlcnic_sre_macaddr_change(struct qlcnic_adapter *adapter, u8 *addr,
return qlcnic_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1);
}
-static int qlcnic_nic_add_mac(struct qlcnic_adapter *adapter, u8 *addr)
+static int qlcnic_nic_add_mac(struct qlcnic_adapter *adapter, const u8 *addr)
{
struct list_head *head;
struct qlcnic_mac_list_s *cur;
@@ -432,7 +432,9 @@ void qlcnic_set_multi(struct net_device *netdev)
{
struct qlcnic_adapter *adapter = netdev_priv(netdev);
struct netdev_hw_addr *ha;
- u8 bcast_addr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
+ static const u8 bcast_addr[ETH_ALEN] = {
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+ };
u32 mode = VPORT_MISS_MODE_DROP;
if (!test_bit(__QLCNIC_FW_ATTACHED, &adapter->state))
@@ -638,10 +640,11 @@ int qlcnic_config_rss(struct qlcnic_adapter *adapter, int enable)
u64 word;
int i, rv;
- const u64 key[] = { 0xbeac01fa6a42b73bULL, 0x8030f20c77cb2da3ULL,
- 0xae7b30b4d0ca2bcbULL, 0x43a38fb04167253dULL,
- 0x255b0ec26d5a56daULL };
-
+ static const u64 key[] = {
+ 0xbeac01fa6a42b73bULL, 0x8030f20c77cb2da3ULL,
+ 0xae7b30b4d0ca2bcbULL, 0x43a38fb04167253dULL,
+ 0x255b0ec26d5a56daULL
+ };
memset(&req, 0, sizeof(struct qlcnic_nic_req));
req.qhdr = cpu_to_le64(QLCNIC_HOST_REQUEST << 23);
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 36/62] qlge: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (34 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 35/62] qlcnic: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 37/62] r8169: " Joe Perches
` (21 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Ron Mercer, linux-driver; +Cc: netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
66820 265 15296 82381 141cd drivers/net/qlge/qlge_main.o.old
66786 265 15296 82347 141ab drivers/net/qlge/qlge_main.o.new
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/qlge/qlge_main.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index d9a7626..01b0533 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -3548,12 +3548,13 @@ err_irq:
static int ql_start_rss(struct ql_adapter *qdev)
{
- u8 init_hash_seed[] = {0x6d, 0x5a, 0x56, 0xda, 0x25, 0x5b, 0x0e, 0xc2,
- 0x41, 0x67, 0x25, 0x3d, 0x43, 0xa3, 0x8f,
- 0xb0, 0xd0, 0xca, 0x2b, 0xcb, 0xae, 0x7b,
- 0x30, 0xb4, 0x77, 0xcb, 0x2d, 0xa3, 0x80,
- 0x30, 0xf2, 0x0c, 0x6a, 0x42, 0xb7, 0x3b,
- 0xbe, 0xac, 0x01, 0xfa};
+ static const u8 init_hash_seed[] = {
+ 0x6d, 0x5a, 0x56, 0xda, 0x25, 0x5b, 0x0e, 0xc2,
+ 0x41, 0x67, 0x25, 0x3d, 0x43, 0xa3, 0x8f, 0xb0,
+ 0xd0, 0xca, 0x2b, 0xcb, 0xae, 0x7b, 0x30, 0xb4,
+ 0x77, 0xcb, 0x2d, 0xa3, 0x80, 0x30, 0xf2, 0x0c,
+ 0x6a, 0x42, 0xb7, 0x3b, 0xbe, 0xac, 0x01, 0xfa
+ };
struct ricb *ricb = &qdev->ricb;
int status = 0;
int i;
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 37/62] r8169: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (35 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 36/62] qlge: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 38/62] s2io: " Joe Perches
` (20 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Francois Romieu; +Cc: netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
43939 232 9904 54075 d33b drivers/net/r8169.o.new
43974 232 9904 54110 d35e drivers/net/r8169.o.old
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/r8169.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index 7d33ef4..f9ad0d6 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -2516,7 +2516,7 @@ static void rtl8168d_2_hw_phy_config(void __iomem *ioaddr)
val = mdio_read(ioaddr, 0x0d);
if ((val & 0x00ff) != 0x006c) {
- u32 set[] = {
+ static const u32 set[] = {
0x0065, 0x0066, 0x0067, 0x0068,
0x0069, 0x006a, 0x006b, 0x006c
};
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 38/62] s2io: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (36 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 37/62] r8169: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-22 5:36 ` Jon Mason
2010-11-21 2:38 ` [PATCH 39/62] skfp: " Joe Perches
` (19 subsequent siblings)
57 siblings, 1 reply; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Ramkrishna Vepa, Sivakumar Subramani, Sreenivasa Honnur,
Jon Mason
Cc: netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object 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>
---
drivers/net/s2io.c | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 0f4219c..22fea37 100644
--- 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);
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* Re: [PATCH 38/62] s2io: Use static const
2010-11-21 2:38 ` [PATCH 38/62] s2io: " Joe Perches
@ 2010-11-22 5:36 ` Jon Mason
0 siblings, 0 replies; 76+ messages in thread
From: Jon Mason @ 2010-11-22 5:36 UTC (permalink / raw)
To: Joe Perches
Cc: Ramkrishna Vepa, Sivakumar Subramani, Sreenivasa Honnur,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
On Sat, Nov 20, 2010 at 06:38:39PM -0800, Joe Perches wrote:
> Using static const generally increases object text and decreases data size.
> It also generally decreases overall object 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>
Looks fine to me. Due to Dave's objections, I'll queue it in our tree
for the next s2io driver patch series.
Thanks,
Jon
> ---
> drivers/net/s2io.c | 20 ++++++++++++--------
> 1 files changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
> index 0f4219c..22fea37 100644
> --- 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);
> --
> 1.7.3.2.245.g03276.dirty
>
The information and any attached documents contained in this message
may be confidential and/or legally privileged. The message is
intended solely for the addressee(s). If you are not the intended
recipient, you are hereby notified that any use, dissemination, or
reproduction is strictly prohibited and may be unlawful. If you are
not the intended recipient, please contact the sender immediately by
return e-mail and destroy all copies of the original message.
^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH 39/62] skfp: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (37 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 38/62] s2io: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 40/62] skge: " Joe Perches
` (18 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
13874 56 2560 16490 406a drivers/net/skfp/smt.o.new
13858 72 2560 16490 406a drivers/net/skfp/smt.o.old
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/skfp/smt.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/skfp/smt.c b/drivers/net/skfp/smt.c
index 2d9941c..1e1bd0c 100644
--- a/drivers/net/skfp/smt.c
+++ b/drivers/net/skfp/smt.c
@@ -1263,7 +1263,7 @@ void smt_set_timestamp(struct s_smc *smc, u_char *p)
static void smt_fill_policy(struct s_smc *smc, struct smt_p_policy *policy)
{
int i ;
- u_char *map ;
+ const u_char *map ;
u_short in ;
u_short out ;
@@ -1271,7 +1271,7 @@ static void smt_fill_policy(struct s_smc *smc, struct smt_p_policy *policy)
* MIB para 101b (fddiSMTConnectionPolicy) coding
* is different from 0005 coding
*/
- static u_char ansi_weirdness[16] = {
+ static const u_char ansi_weirdness[16] = {
0,7,5,3,8,1,6,4,9,10,2,11,12,13,14,15
} ;
SMTSETPARA(policy,SMT_P_POLICY) ;
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 40/62] skge: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (38 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 39/62] skfp: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 41/62] smc-ultra: " Joe Perches
` (17 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
52665 927 12680 66272 102e0 drivers/net/skge.o.new
52730 927 12680 66337 10321 drivers/net/skge.o.old
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/skge.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 220e039..e9dbe52 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -1191,7 +1191,7 @@ static void genesis_init(struct skge_hw *hw)
static void genesis_reset(struct skge_hw *hw, int port)
{
- const u8 zero[8] = { 0 };
+ static const u8 zero[8] = { 0 };
u32 reg;
skge_write8(hw, SK_REG(port, GMAC_IRQ_MSK), 0);
@@ -1557,7 +1557,7 @@ static void genesis_mac_init(struct skge_hw *hw, int port)
int jumbo = hw->dev[port]->mtu > ETH_DATA_LEN;
int i;
u32 r;
- const u8 zero[6] = { 0 };
+ static const u8 zero[6] = { 0 };
for (i = 0; i < 10; i++) {
skge_write16(hw, SK_REG(port, TX_MFF_CTRL1),
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 41/62] smc-ultra: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (39 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 40/62] skge: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 42/62] tg3: " Joe Perches
` (16 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
5316 112 1176 6604 19cc drivers/net/smc-ultra.o.new
5302 112 1176 6590 19be drivers/net/smc-ultra.o.old
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/smc-ultra.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/net/smc-ultra.c b/drivers/net/smc-ultra.c
index d2dd8e6..235a3c6 100644
--- a/drivers/net/smc-ultra.c
+++ b/drivers/net/smc-ultra.c
@@ -277,8 +277,12 @@ static int __init ultra_probe1(struct net_device *dev, int ioaddr)
dev->base_addr = ioaddr+ULTRA_NIC_OFFSET;
{
- int addr_tbl[4] = {0x0C0000, 0x0E0000, 0xFC0000, 0xFE0000};
- short num_pages_tbl[4] = {0x20, 0x40, 0x80, 0xff};
+ static const int addr_tbl[4] = {
+ 0x0C0000, 0x0E0000, 0xFC0000, 0xFE0000
+ };
+ static const short num_pages_tbl[4] = {
+ 0x20, 0x40, 0x80, 0xff
+ };
dev->mem_start = ((addr & 0x0f) << 13) + addr_tbl[(addr >> 6) & 3] ;
num_pages = num_pages_tbl[(addr >> 4) & 3];
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 42/62] tg3: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (40 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 41/62] smc-ultra: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 43/62] tokenring: " Joe Perches
` (15 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Matt Carlson, Michael Chan; +Cc: netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
168118 970 41008 210096 334b0 drivers/net/tg3.o.old
168286 802 41008 210096 334b0 drivers/net/tg3.o.new
Use DEFINE_PCI_DEVICE_TABLE not direct declarations.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/tg3.c | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 30ccbb6..93483a7 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -13047,17 +13047,15 @@ static inline u32 tg3_rx_ret_ring_size(struct tg3 *tp)
return 512;
}
+DEFINE_PCI_DEVICE_TABLE(write_reorder_chipsets) = {
+ { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_FE_GATE_700C) },
+ { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE) },
+ { PCI_DEVICE(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8385_0) },
+ { },
+};
+
static int __devinit tg3_get_invariants(struct tg3 *tp)
{
- static struct pci_device_id write_reorder_chipsets[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_AMD,
- PCI_DEVICE_ID_AMD_FE_GATE_700C) },
- { PCI_DEVICE(PCI_VENDOR_ID_AMD,
- PCI_DEVICE_ID_AMD_8131_BRIDGE) },
- { PCI_DEVICE(PCI_VENDOR_ID_VIA,
- PCI_DEVICE_ID_VIA_8385_0) },
- { },
- };
u32 misc_ctrl_reg;
u32 pci_state_reg, grc_misc_cfg;
u32 val;
@@ -14153,6 +14151,11 @@ static int __devinit tg3_do_test_dma(struct tg3 *tp, u32 *buf, dma_addr_t buf_dm
#define TEST_BUFFER_SIZE 0x2000
+DEFINE_PCI_DEVICE_TABLE(dma_wait_state_chipsets) = {
+ { PCI_DEVICE(PCI_VENDOR_ID_APPLE, PCI_DEVICE_ID_APPLE_UNI_N_PCI15) },
+ { },
+};
+
static int __devinit tg3_test_dma(struct tg3 *tp)
{
dma_addr_t buf_dma;
@@ -14321,11 +14324,6 @@ static int __devinit tg3_test_dma(struct tg3 *tp)
}
if ((tp->dma_rwctrl & DMA_RWCTRL_WRITE_BNDRY_MASK) !=
DMA_RWCTRL_WRITE_BNDRY_16) {
- static struct pci_device_id dma_wait_state_chipsets[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_APPLE,
- PCI_DEVICE_ID_APPLE_UNI_N_PCI15) },
- { },
- };
/* DMA test passed without adjusting DMA boundary,
* now look for chipsets that are known to expose the
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 43/62] tokenring: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (41 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 42/62] tg3: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 44/62] tulip: " Joe Perches
` (14 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
21834 549 5144 27527 6b87 drivers/net/tokenring/ibmtr.o.old
21834 549 5144 27527 6b87 drivers/net/tokenring/ibmtr.o.new
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/tokenring/ibmtr.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c
index 91e6c78..4786497 100644
--- a/drivers/net/tokenring/ibmtr.c
+++ b/drivers/net/tokenring/ibmtr.c
@@ -657,8 +657,9 @@ static int __devinit ibmtr_probe1(struct net_device *dev, int PIOaddr)
#ifndef PCMCIA
/* finish figuring the shared RAM address */
if (cardpresent == TR_ISA) {
- static __u32 ram_bndry_mask[] =
- { 0xffffe000, 0xffffc000, 0xffff8000, 0xffff0000 };
+ static const __u32 ram_bndry_mask[] = {
+ 0xffffe000, 0xffffc000, 0xffff8000, 0xffff0000
+ };
__u32 new_base, rrr_32, chk_base, rbm;
rrr_32=readb(ti->mmio+ACA_OFFSET+ACA_RW+RRR_ODD) >> 2 & 0x03;
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 44/62] tulip: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (42 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 43/62] tokenring: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 45/62] " Joe Perches
` (13 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Grant Grundler, Kyle McMartin; +Cc: netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
26607 288 5960 32855 8057 drivers/net/tulip/de2104x.o.old
26587 288 5960 32835 8043 drivers/net/tulip/de2104x.o.new
Changed de_next_media to take a const u32 *.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/tulip/de2104x.c | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index c78a505..b13c6b0 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -964,7 +964,7 @@ static void de_set_media (struct de_private *de)
dw32(MacMode, macmode);
}
-static void de_next_media (struct de_private *de, u32 *media,
+static void de_next_media (struct de_private *de, const u32 *media,
unsigned int n_media)
{
unsigned int i;
@@ -1008,10 +1008,10 @@ static void de21040_media_timer (unsigned long data)
return;
if (de->media_type == DE_MEDIA_AUI) {
- u32 next_state = DE_MEDIA_TP;
+ static const u32 next_state = DE_MEDIA_TP;
de_next_media(de, &next_state, 1);
} else {
- u32 next_state = DE_MEDIA_AUI;
+ static const u32 next_state = DE_MEDIA_AUI;
de_next_media(de, &next_state, 1);
}
@@ -1136,13 +1136,19 @@ static void de21041_media_timer (unsigned long data)
* simply resets the PHY and reloads the current media settings.
*/
if (de->media_type == DE_MEDIA_AUI) {
- u32 next_states[] = { DE_MEDIA_BNC, DE_MEDIA_TP_AUTO };
+ static const u32 next_states[] = {
+ DE_MEDIA_BNC, DE_MEDIA_TP_AUTO
+ };
de_next_media(de, next_states, ARRAY_SIZE(next_states));
} else if (de->media_type == DE_MEDIA_BNC) {
- u32 next_states[] = { DE_MEDIA_TP_AUTO, DE_MEDIA_AUI };
+ static const u32 next_states[] = {
+ DE_MEDIA_TP_AUTO, DE_MEDIA_AUI
+ };
de_next_media(de, next_states, ARRAY_SIZE(next_states));
} else {
- u32 next_states[] = { DE_MEDIA_AUI, DE_MEDIA_BNC, DE_MEDIA_TP_AUTO };
+ static const u32 next_states[] = {
+ DE_MEDIA_AUI, DE_MEDIA_BNC, DE_MEDIA_TP_AUTO
+ };
de_next_media(de, next_states, ARRAY_SIZE(next_states));
}
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 45/62] tulip: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (43 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 44/62] tulip: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 47/62] vmxnet3: " Joe Perches
` (12 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Grant Grundler, Kyle McMartin; +Cc: netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
26150 657 5416 32223 7ddf drivers/net/tulip/tulip_core.o.new
26054 741 5416 32211 7dd3 drivers/net/tulip/tulip_core.o.old
Use DEFINE_PCI_DEVICE_TABLE for local declaration.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/tulip/tulip_core.c | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index 2c39f25..5c01e26 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -1302,17 +1302,18 @@ static const struct net_device_ops tulip_netdev_ops = {
#endif
};
+DEFINE_PCI_DEVICE_TABLE(early_486_chipsets) = {
+ { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82424) },
+ { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_496) },
+ { },
+};
+
static int __devinit tulip_init_one (struct pci_dev *pdev,
const struct pci_device_id *ent)
{
struct tulip_private *tp;
/* See note below on the multiport cards. */
static unsigned char last_phys_addr[6] = {0x00, 'L', 'i', 'n', 'u', 'x'};
- static struct pci_device_id early_486_chipsets[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82424) },
- { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_496) },
- { },
- };
static int last_irq;
static int multiport_cnt; /* For four-port boards w/one EEPROM */
int i, irq;
@@ -1682,7 +1683,9 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
tp->full_duplex_lock = 1;
if (tulip_media_cap[tp->default_port] & MediaIsMII) {
- u16 media2advert[] = { 0x20, 0x40, 0x03e0, 0x60, 0x80, 0x100, 0x200 };
+ static const u16 media2advert[] = {
+ 0x20, 0x40, 0x03e0, 0x60, 0x80, 0x100, 0x200
+ };
tp->mii_advertise = media2advert[tp->default_port - 9];
tp->mii_advertise |= (tp->flags & HAS_8023X); /* Matching bits! */
}
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 47/62] vmxnet3: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (44 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 45/62] " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-30 18:15 ` Shreyas Bhatewara
2010-11-21 2:38 ` [PATCH 48/62] wan: " Joe Perches
` (11 subsequent siblings)
57 siblings, 1 reply; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Shreyas Bhatewara, VMware, Inc.; +Cc: netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
38916 437 9160 48513 bd81 drivers/net/vmxnet3/vmxnet3_drv.o.new
38916 437 9160 48513 bd81 drivers/net/vmxnet3/vmxnet3_drv.o.old
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/vmxnet3/vmxnet3_drv.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 21314e0..31dc45a 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -1082,7 +1082,9 @@ static int
vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
struct vmxnet3_adapter *adapter, int quota)
{
- static u32 rxprod_reg[2] = {VMXNET3_REG_RXPROD, VMXNET3_REG_RXPROD2};
+ static const u32 rxprod_reg[2] = {
+ VMXNET3_REG_RXPROD, VMXNET3_REG_RXPROD2
+ };
u32 num_rxd = 0;
struct Vmxnet3_RxCompDesc *rcd;
struct vmxnet3_rx_ctx *ctx = &rq->rx_ctx;
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* RE: [PATCH 47/62] vmxnet3: Use static const
2010-11-21 2:38 ` [PATCH 47/62] vmxnet3: " Joe Perches
@ 2010-11-30 18:15 ` Shreyas Bhatewara
2010-11-30 18:24 ` David Miller
0 siblings, 1 reply; 76+ messages in thread
From: Shreyas Bhatewara @ 2010-11-30 18:15 UTC (permalink / raw)
To: Joe Perches, VMware, Inc.
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Thanks Joe.
Acked-by: Shreyas N Bhatewara <sbhatewara@vmware.com>
Acked-by: Scott J. Goldman <scottjg@vmware.com>
________________________________________
From: Joe Perches [joe@perches.com]
Sent: Saturday, November 20, 2010 6:38 PM
To: Shreyas Bhatewara; VMware, Inc.
Cc: netdev@vger.kernel.org; linux-kernel@vger.kernel.org
Subject: [PATCH 47/62] vmxnet3: Use static const
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
38916 437 9160 48513 bd81 drivers/net/vmxnet3/vmxnet3_drv.o.new
38916 437 9160 48513 bd81 drivers/net/vmxnet3/vmxnet3_drv.o.old
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/vmxnet3/vmxnet3_drv.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c
index 21314e0..31dc45a 100644
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
@@ -1082,7 +1082,9 @@ static int
vmxnet3_rq_rx_complete(struct vmxnet3_rx_queue *rq,
struct vmxnet3_adapter *adapter, int quota)
{
- static u32 rxprod_reg[2] = {VMXNET3_REG_RXPROD, VMXNET3_REG_RXPROD2};
+ static const u32 rxprod_reg[2] = {
+ VMXNET3_REG_RXPROD, VMXNET3_REG_RXPROD2
+ };
u32 num_rxd = 0;
struct Vmxnet3_RxCompDesc *rcd;
struct vmxnet3_rx_ctx *ctx = &rq->rx_ctx;
^ permalink raw reply related [flat|nested] 76+ messages in thread* Re: [PATCH 47/62] vmxnet3: Use static const
2010-11-30 18:15 ` Shreyas Bhatewara
@ 2010-11-30 18:24 ` David Miller
2010-11-30 18:36 ` Joe Perches
0 siblings, 1 reply; 76+ messages in thread
From: David Miller @ 2010-11-30 18:24 UTC (permalink / raw)
To: sbhatewara; +Cc: joe, pv-drivers, netdev, linux-kernel
From: Shreyas Bhatewara <sbhatewara@vmware.com>
Date: Tue, 30 Nov 2010 10:15:58 -0800
> Thanks Joe.
>
> Acked-by: Shreyas N Bhatewara <sbhatewara@vmware.com>
> Acked-by: Scott J. Goldman <scottjg@vmware.com>
Please do not quote patches in this way when you ACK patches.
Since your email client doesn't use any delimiters to prefix the
quoted patch, it looks to patchwork and the rest of the world as a
fresh new patch posting.
Also, you are top-posting which is also a big no-no on these lists.
^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH 47/62] vmxnet3: Use static const
2010-11-30 18:24 ` David Miller
@ 2010-11-30 18:36 ` Joe Perches
0 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-30 18:36 UTC (permalink / raw)
To: David Miller; +Cc: sbhatewara, pv-drivers, netdev, linux-kernel
On Tue, 2010-11-30 at 10:24 -0800, David Miller wrote:
> From: Shreyas Bhatewara <sbhatewara@vmware.com>
> Date: Tue, 30 Nov 2010 10:15:58 -0800
> > Acked-by: Shreyas N Bhatewara <sbhatewara@vmware.com>
> > Acked-by: Scott J. Goldman <scottjg@vmware.com>
> Please do not quote patches in this way when you ACK patches.
> Since your email client doesn't use any delimiters to prefix the
> quoted patch, it looks to patchwork and the rest of the world as a
> fresh new patch posting.
Shreyas is YA exchange/lookout victim.
I personally liked Outlook when I used it.
Exchange? grumble.
^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH 48/62] wan: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (45 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 47/62] vmxnet3: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 49/62] wd: " Joe Perches
` (10 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Francois Romieu; +Cc: netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
20550 335 4688 25573 63e5 drivers/net/wan/dscc4.o.old
20518 335 4688 25541 63c5 drivers/net/wan/dscc4.o.new
Changed dscc4_match to take a const struct thingie *p
(No, I didn't name that struct...)
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/wan/dscc4.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index 94ff9b0..4578e5b 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -1358,7 +1358,7 @@ static int dscc4_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
return ret;
}
-static int dscc4_match(struct thingie *p, int value)
+static int dscc4_match(const struct thingie *p, int value)
{
int i;
@@ -1403,7 +1403,7 @@ done:
static int dscc4_encoding_setting(struct dscc4_dev_priv *dpriv,
struct net_device *dev)
{
- struct thingie encoding[] = {
+ static const struct thingie encoding[] = {
{ ENCODING_NRZ, 0x00000000 },
{ ENCODING_NRZI, 0x00200000 },
{ ENCODING_FM_MARK, 0x00400000 },
@@ -1442,7 +1442,7 @@ static int dscc4_loopback_setting(struct dscc4_dev_priv *dpriv,
static int dscc4_crc_setting(struct dscc4_dev_priv *dpriv,
struct net_device *dev)
{
- struct thingie crc[] = {
+ static const struct thingie crc[] = {
{ PARITY_CRC16_PR0_CCITT, 0x00000010 },
{ PARITY_CRC16_PR1_CCITT, 0x00000000 },
{ PARITY_CRC32_PR0_CCITT, 0x00000011 },
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 49/62] wd: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (46 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 48/62] wan: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 50/62] ar9170: Use const Joe Perches
` (9 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: netdev; +Cc: linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
5252 76 1152 6480 1950 drivers/net/wd.o.old
5199 76 1152 6427 191b drivers/net/wd.o.new
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/wd.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wd.c b/drivers/net/wd.c
index f1549ff..8831a33 100644
--- a/drivers/net/wd.c
+++ b/drivers/net/wd.c
@@ -275,7 +275,7 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr)
dev->base_addr = ioaddr+WD_NIC_OFFSET;
if (dev->irq < 2) {
- int irqmap[] = {9,3,5,7,10,11,15,4};
+ static const int irqmap[] = {9, 3, 5, 7, 10, 11, 15, 4};
int reg1 = inb(ioaddr+1);
int reg4 = inb(ioaddr+4);
if (ancient || reg1 == 0xff) { /* Ack!! No way to read the IRQ! */
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 50/62] ar9170: Use const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (47 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 49/62] wd: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 51/62] ath5k: Use static const Joe Perches
` (8 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Christian Lamparter
Cc: John W. Linville, linux-wireless, netdev, linux-kernel
Mark an array const.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/wireless/ath/ar9170/cmd.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/ath/ar9170/cmd.c b/drivers/net/wireless/ath/ar9170/cmd.c
index 4604de0..6452c50 100644
--- a/drivers/net/wireless/ath/ar9170/cmd.c
+++ b/drivers/net/wireless/ath/ar9170/cmd.c
@@ -54,7 +54,7 @@ int ar9170_write_mem(struct ar9170 *ar, const __le32 *data, size_t len)
int ar9170_write_reg(struct ar9170 *ar, const u32 reg, const u32 val)
{
- __le32 buf[2] = {
+ const __le32 buf[2] = {
cpu_to_le32(reg),
cpu_to_le32(val),
};
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 51/62] ath5k: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (48 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 50/62] ar9170: Use const Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 52/62] ath9k: " Joe Perches
` (7 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Jiri Slaby, Nick Kossifidis, Luis R. Rodriguez, Bob Copeland
Cc: John W. Linville, linux-wireless, ath5k-devel, netdev,
linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
11266 56 2464 13786 35da drivers/net/wireless/ath/ath5k/ani.o.old
11181 56 2464 13701 3585 drivers/net/wireless/ath/ath5k/ani.o.new
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/wireless/ath/ath5k/ani.c | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/net/wireless/ath/ath5k/ani.c b/drivers/net/wireless/ath/ath5k/ani.c
index db98a85..6b75b22 100644
--- a/drivers/net/wireless/ath/ath5k/ani.c
+++ b/drivers/net/wireless/ath/ath5k/ani.c
@@ -63,15 +63,15 @@ ath5k_ani_set_noise_immunity_level(struct ath5k_hw *ah, int level)
* so i stick with the HAL version for now...
*/
#if 0
- const s8 hi[] = { -18, -18, -16, -14, -12 };
- const s8 lo[] = { -52, -56, -60, -64, -70 };
- const s8 sz[] = { -34, -41, -48, -55, -62 };
- const s8 fr[] = { -70, -72, -75, -78, -80 };
+ static const s8 hi[] = { -18, -18, -16, -14, -12 };
+ static const s8 lo[] = { -52, -56, -60, -64, -70 };
+ static const s8 sz[] = { -34, -41, -48, -55, -62 };
+ static const s8 fr[] = { -70, -72, -75, -78, -80 };
#else
- const s8 sz[] = { -55, -62 };
- const s8 lo[] = { -64, -70 };
- const s8 hi[] = { -14, -12 };
- const s8 fr[] = { -78, -80 };
+ static const s8 sz[] = { -55, -62 };
+ static const s8 lo[] = { -64, -70 };
+ static const s8 hi[] = { -14, -12 };
+ static const s8 fr[] = { -78, -80 };
#endif
if (level < 0 || level >= ARRAY_SIZE(sz)) {
ATH5K_ERR(ah->ah_sc, "noise immuniy level %d out of range",
@@ -102,7 +102,7 @@ ath5k_ani_set_noise_immunity_level(struct ath5k_hw *ah, int level)
void
ath5k_ani_set_spur_immunity_level(struct ath5k_hw *ah, int level)
{
- const int val[] = { 2, 4, 6, 8, 10, 12, 14, 16 };
+ static const int val[] = { 2, 4, 6, 8, 10, 12, 14, 16 };
if (level < 0 || level >= ARRAY_SIZE(val) ||
level > ah->ah_sc->ani_state.max_spur_level) {
@@ -127,7 +127,7 @@ ath5k_ani_set_spur_immunity_level(struct ath5k_hw *ah, int level)
void
ath5k_ani_set_firstep_level(struct ath5k_hw *ah, int level)
{
- const int val[] = { 0, 4, 8 };
+ static const int val[] = { 0, 4, 8 };
if (level < 0 || level >= ARRAY_SIZE(val)) {
ATH5K_ERR(ah->ah_sc, "firstep level %d out of range", level);
@@ -151,12 +151,12 @@ ath5k_ani_set_firstep_level(struct ath5k_hw *ah, int level)
void
ath5k_ani_set_ofdm_weak_signal_detection(struct ath5k_hw *ah, bool on)
{
- const int m1l[] = { 127, 50 };
- const int m2l[] = { 127, 40 };
- const int m1[] = { 127, 0x4d };
- const int m2[] = { 127, 0x40 };
- const int m2cnt[] = { 31, 16 };
- const int m2lcnt[] = { 63, 48 };
+ static const int m1l[] = { 127, 50 };
+ static const int m2l[] = { 127, 40 };
+ static const int m1[] = { 127, 0x4d };
+ static const int m2[] = { 127, 0x40 };
+ static const int m2cnt[] = { 31, 16 };
+ static const int m2lcnt[] = { 63, 48 };
AR5K_REG_WRITE_BITS(ah, AR5K_PHY_WEAK_OFDM_LOW_THR,
AR5K_PHY_WEAK_OFDM_LOW_THR_M1, m1l[on]);
@@ -192,7 +192,7 @@ ath5k_ani_set_ofdm_weak_signal_detection(struct ath5k_hw *ah, bool on)
void
ath5k_ani_set_cck_weak_signal_detection(struct ath5k_hw *ah, bool on)
{
- const int val[] = { 8, 6 };
+ static const int val[] = { 8, 6 };
AR5K_REG_WRITE_BITS(ah, AR5K_PHY_CCK_CROSSCORR,
AR5K_PHY_CCK_CROSSCORR_WEAK_SIG_THR, val[on]);
ah->ah_sc->ani_state.cck_weak_sig = on;
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 52/62] ath9k: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (49 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 51/62] ath5k: Use static const Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 53/62] carl9170: " Joe Perches
` (6 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Luis R. Rodriguez, Jouni Malinen, Vasanthakumar Thiagarajan,
Senthil Balasubramanian
Cc: netdev, ath9k-devel, linux-wireless, John W. Linville,
linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
11161 56 2136 13353 3429 drivers/net/wireless/ath/ath9k/ar9003_paprd.o.new
11167 56 2136 13359 342f drivers/net/wireless/ath/ath9k/ar9003_paprd.o.old
15428 56 3056 18540 486c drivers/net/wireless/ath/ath9k/eeprom_4k.o.old
15451 56 3056 18563 4883 drivers/net/wireless/ath/ath9k/eeprom_4k.o.new
14087 56 2560 16703 413f drivers/net/wireless/ath/ath9k/eeprom_9287.o.old
14036 56 2560 16652 410c drivers/net/wireless/ath/ath9k/eeprom_9287.o.new
10041 56 2384 12481 30c1 drivers/net/wireless/ath/ath9k/ani.o.new
10088 56 2384 12528 30f0 drivers/net/wireless/ath/ath9k/ani.o.old
9316 1580 2304 13200 3390 drivers/net/wireless/ath/ath9k/htc_drv_init.o.new
9316 1580 2304 13200 3390 drivers/net/wireless/ath/ath9k/htc_drv_init.o.old
16483 56 3432 19971 4e03 drivers/net/wireless/ath/ath9k/ar9003_phy.o.new
16517 56 3432 20005 4e25 drivers/net/wireless/ath/ath9k/ar9003_phy.o.old
18221 104 2960 21285 5325 drivers/net/wireless/ath/ath9k/rc.o.old
18203 104 2960 21267 5313 drivers/net/wireless/ath/ath9k/rc.o.new
19985 56 4288 24329 5f09 drivers/net/wireless/ath/ath9k/eeprom_def.o.new
20040 56 4288 24384 5f40 drivers/net/wireless/ath/ath9k/eeprom_def.o.old
23997 56 4984 29037 716d drivers/net/wireless/ath/ath9k/ar5008_phy.o.old
23846 56 4984 28886 70d6 drivers/net/wireless/ath/ath9k/ar5008_phy.o.new
24285 56 3184 27525 6b85 drivers/net/wireless/ath/ath9k/ar9003_eeprom.o.old
24101 56 3184 27341 6acd drivers/net/wireless/ath/ath9k/ar9003_eeprom.o.new
6834 56 1032 7922 1ef2 drivers/net/wireless/ath/ath9k/ar9002_phy.o.old
6780 56 1032 7868 1ebc drivers/net/wireless/ath/ath9k/ar9002_phy.o.new
36211 64 8624 44899 af63 drivers/net/wireless/ath/ath9k/hw.o.new
36401 64 8624 45089 b021 drivers/net/wireless/ath/ath9k/hw.o.old
9281 56 1496 10833 2a51 drivers/net/wireless/ath/ath9k/ar9003_calib.o.old
9150 56 1496 10702 29ce drivers/net/wireless/ath/ath9k/ar9003_calib.o.new
Use ARRAY_SIZE instead of a magic number.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/wireless/ath/ath9k/ani.c | 8 +++---
drivers/net/wireless/ath/ath9k/ar5008_phy.c | 32 ++++++++++++-----------
drivers/net/wireless/ath/ath9k/ar9002_phy.c | 12 +++++---
drivers/net/wireless/ath/ath9k/ar9003_calib.c | 10 +++---
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 8 +++--
drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 4 +-
drivers/net/wireless/ath/ath9k/ar9003_phy.c | 4 +-
drivers/net/wireless/ath/ath9k/eeprom_4k.c | 12 +++++---
drivers/net/wireless/ath/ath9k/eeprom_9287.c | 14 +++++-----
drivers/net/wireless/ath/ath9k/eeprom_def.c | 17 +++++++-----
drivers/net/wireless/ath/ath9k/htc_drv_init.c | 2 +-
drivers/net/wireless/ath/ath9k/hw.c | 9 +++---
drivers/net/wireless/ath/ath9k/rc.c | 6 ++--
13 files changed, 74 insertions(+), 64 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/ani.c b/drivers/net/wireless/ath/ath9k/ani.c
index 63ccb39..29a045d 100644
--- a/drivers/net/wireless/ath/ath9k/ani.c
+++ b/drivers/net/wireless/ath/ath9k/ani.c
@@ -834,10 +834,10 @@ void ath9k_hw_ani_setup(struct ath_hw *ah)
{
int i;
- const int totalSizeDesired[] = { -55, -55, -55, -55, -62 };
- const int coarseHigh[] = { -14, -14, -14, -14, -12 };
- const int coarseLow[] = { -64, -64, -64, -64, -70 };
- const int firpwr[] = { -78, -78, -78, -78, -80 };
+ static const int totalSizeDesired[] = { -55, -55, -55, -55, -62 };
+ static const int coarseHigh[] = { -14, -14, -14, -14, -12 };
+ static const int coarseLow[] = { -64, -64, -64, -64, -70 };
+ static const int firpwr[] = { -78, -78, -78, -78, -80 };
for (i = 0; i < 5; i++) {
ah->totalSizeDesired[i] = totalSizeDesired[i];
diff --git a/drivers/net/wireless/ath/ath9k/ar5008_phy.c b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
index 7303d98..06e34d2 100644
--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
@@ -244,13 +244,15 @@ static void ar5008_hw_spur_mitigate(struct ath_hw *ah,
int upper, lower, cur_vit_mask;
int tmp, new;
int i;
- int pilot_mask_reg[4] = { AR_PHY_TIMING7, AR_PHY_TIMING8,
- AR_PHY_PILOT_MASK_01_30, AR_PHY_PILOT_MASK_31_60
+ static int pilot_mask_reg[4] = {
+ AR_PHY_TIMING7, AR_PHY_TIMING8,
+ AR_PHY_PILOT_MASK_01_30, AR_PHY_PILOT_MASK_31_60
};
- int chan_mask_reg[4] = { AR_PHY_TIMING9, AR_PHY_TIMING10,
- AR_PHY_CHANNEL_MASK_01_30, AR_PHY_CHANNEL_MASK_31_60
+ static int chan_mask_reg[4] = {
+ AR_PHY_TIMING9, AR_PHY_TIMING10,
+ AR_PHY_CHANNEL_MASK_01_30, AR_PHY_CHANNEL_MASK_31_60
};
- int inc[4] = { 0, 100, 0, 0 };
+ static int inc[4] = { 0, 100, 0, 0 };
int8_t mask_m[123];
int8_t mask_p[123];
@@ -1084,12 +1086,12 @@ static bool ar5008_hw_ani_control_old(struct ath_hw *ah,
break;
}
case ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION:{
- const int m1ThreshLow[] = { 127, 50 };
- const int m2ThreshLow[] = { 127, 40 };
- const int m1Thresh[] = { 127, 0x4d };
- const int m2Thresh[] = { 127, 0x40 };
- const int m2CountThr[] = { 31, 16 };
- const int m2CountThrLow[] = { 63, 48 };
+ static const int m1ThreshLow[] = { 127, 50 };
+ static const int m2ThreshLow[] = { 127, 40 };
+ static const int m1Thresh[] = { 127, 0x4d };
+ static const int m2Thresh[] = { 127, 0x40 };
+ static const int m2CountThr[] = { 31, 16 };
+ static const int m2CountThrLow[] = { 63, 48 };
u32 on = param ? 1 : 0;
REG_RMW_FIELD(ah, AR_PHY_SFCORR_LOW,
@@ -1141,7 +1143,7 @@ static bool ar5008_hw_ani_control_old(struct ath_hw *ah,
break;
}
case ATH9K_ANI_CCK_WEAK_SIGNAL_THR:{
- const int weakSigThrCck[] = { 8, 6 };
+ static const int weakSigThrCck[] = { 8, 6 };
u32 high = param ? 1 : 0;
REG_RMW_FIELD(ah, AR_PHY_CCK_DETECT,
@@ -1157,7 +1159,7 @@ static bool ar5008_hw_ani_control_old(struct ath_hw *ah,
break;
}
case ATH9K_ANI_FIRSTEP_LEVEL:{
- const int firstep[] = { 0, 4, 8 };
+ static const int firstep[] = { 0, 4, 8 };
u32 level = param;
if (level >= ARRAY_SIZE(firstep)) {
@@ -1178,7 +1180,7 @@ static bool ar5008_hw_ani_control_old(struct ath_hw *ah,
break;
}
case ATH9K_ANI_SPUR_IMMUNITY_LEVEL:{
- const int cycpwrThr1[] = { 2, 4, 6, 8, 10, 12, 14, 16 };
+ static const int cycpwrThr1[] = { 2, 4, 6, 8, 10, 12, 14, 16 };
u32 level = param;
if (level >= ARRAY_SIZE(cycpwrThr1)) {
@@ -1627,7 +1629,7 @@ static void ar5008_hw_set_radar_conf(struct ath_hw *ah)
void ar5008_hw_attach_phy_ops(struct ath_hw *ah)
{
struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
- const u32 ar5416_cca_regs[6] = {
+ static const u32 ar5416_cca_regs[6] = {
AR_PHY_CCA,
AR_PHY_CH1_CCA,
AR_PHY_CH2_CCA,
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_phy.c b/drivers/net/wireless/ath/ath9k/ar9002_phy.c
index 3fb97fd..7ae66a8 100644
--- a/drivers/net/wireless/ath/ath9k/ar9002_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9002_phy.c
@@ -175,13 +175,15 @@ static void ar9002_hw_spur_mitigate(struct ath_hw *ah,
int upper, lower, cur_vit_mask;
int tmp, newVal;
int i;
- int pilot_mask_reg[4] = { AR_PHY_TIMING7, AR_PHY_TIMING8,
- AR_PHY_PILOT_MASK_01_30, AR_PHY_PILOT_MASK_31_60
+ static const int pilot_mask_reg[4] = {
+ AR_PHY_TIMING7, AR_PHY_TIMING8,
+ AR_PHY_PILOT_MASK_01_30, AR_PHY_PILOT_MASK_31_60
};
- int chan_mask_reg[4] = { AR_PHY_TIMING9, AR_PHY_TIMING10,
- AR_PHY_CHANNEL_MASK_01_30, AR_PHY_CHANNEL_MASK_31_60
+ static const int chan_mask_reg[4] = {
+ AR_PHY_TIMING9, AR_PHY_TIMING10,
+ AR_PHY_CHANNEL_MASK_01_30, AR_PHY_CHANNEL_MASK_31_60
};
- int inc[4] = { 0, 100, 0, 0 };
+ static const int inc[4] = { 0, 100, 0, 0 };
struct chan_centers centers;
int8_t mask_m[123];
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_calib.c b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
index 32eed19..4c94c9e 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
@@ -196,7 +196,7 @@ static void ar9003_hw_iqcalibrate(struct ath_hw *ah, u8 numChains)
u32 qCoffDenom, iCoffDenom;
int32_t qCoff, iCoff;
int iqCorrNeg, i;
- const u_int32_t offset_array[3] = {
+ static const u_int32_t offset_array[3] = {
AR_PHY_RX_IQCAL_CORR_B0,
AR_PHY_RX_IQCAL_CORR_B1,
AR_PHY_RX_IQCAL_CORR_B2,
@@ -603,22 +603,22 @@ static bool ar9003_hw_calc_iq_corr(struct ath_hw *ah,
static void ar9003_hw_tx_iq_cal(struct ath_hw *ah)
{
struct ath_common *common = ath9k_hw_common(ah);
- const u32 txiqcal_status[AR9300_MAX_CHAINS] = {
+ static const u32 txiqcal_status[AR9300_MAX_CHAINS] = {
AR_PHY_TX_IQCAL_STATUS_B0,
AR_PHY_TX_IQCAL_STATUS_B1,
AR_PHY_TX_IQCAL_STATUS_B2,
};
- const u32 tx_corr_coeff[AR9300_MAX_CHAINS] = {
+ static const u32 tx_corr_coeff[AR9300_MAX_CHAINS] = {
AR_PHY_TX_IQCAL_CORR_COEFF_01_B0,
AR_PHY_TX_IQCAL_CORR_COEFF_01_B1,
AR_PHY_TX_IQCAL_CORR_COEFF_01_B2,
};
- const u32 rx_corr[AR9300_MAX_CHAINS] = {
+ static const u32 rx_corr[AR9300_MAX_CHAINS] = {
AR_PHY_RX_IQCAL_CORR_B0,
AR_PHY_RX_IQCAL_CORR_B1,
AR_PHY_RX_IQCAL_CORR_B2,
};
- const u_int32_t chan_info_tab[] = {
+ static const u_int32_t chan_info_tab[] = {
AR_PHY_CHAN_INFO_TAB_0,
AR_PHY_CHAN_INFO_TAB_1,
AR_PHY_CHAN_INFO_TAB_2,
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index 9a7e151..3161a59 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@ -4455,14 +4455,16 @@ static void ar9003_hw_set_power_per_rate_table(struct ath_hw *ah,
int i;
int16_t twiceLargestAntenna;
u16 scaledPower = 0, minCtlPower, maxRegAllowedPower;
- u16 ctlModesFor11a[] = {
+ static const u16 ctlModesFor11a[] = {
CTL_11A, CTL_5GHT20, CTL_11A_EXT, CTL_5GHT40
};
- u16 ctlModesFor11g[] = {
+ static const u16 ctlModesFor11g[] = {
CTL_11B, CTL_11G, CTL_2GHT20, CTL_11B_EXT,
CTL_11G_EXT, CTL_2GHT40
};
- u16 numCtlModes, *pCtlMode, ctlMode, freq;
+ u16 numCtlModes;
+ const u16 *pCtlMode;
+ u16 ctlMode, freq;
struct chan_centers centers;
u8 *ctlIndex;
u8 ctlNum;
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
index 716db41..850bc98 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
@@ -32,12 +32,12 @@ static void ar9003_paprd_setup_single_table(struct ath_hw *ah)
{
struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
struct ar9300_modal_eep_header *hdr;
- const u32 ctrl0[3] = {
+ static const u32 ctrl0[3] = {
AR_PHY_PAPRD_CTRL0_B0,
AR_PHY_PAPRD_CTRL0_B1,
AR_PHY_PAPRD_CTRL0_B2
};
- const u32 ctrl1[3] = {
+ static const u32 ctrl1[3] = {
AR_PHY_PAPRD_CTRL1_B0,
AR_PHY_PAPRD_CTRL1_B1,
AR_PHY_PAPRD_CTRL1_B2
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
index e8d6455..656d8ce 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
@@ -128,7 +128,7 @@ static int ar9003_hw_set_channel(struct ath_hw *ah, struct ath9k_channel *chan)
static void ar9003_hw_spur_mitigate_mrc_cck(struct ath_hw *ah,
struct ath9k_channel *chan)
{
- u32 spur_freq[4] = { 2420, 2440, 2464, 2480 };
+ static const u32 spur_freq[4] = { 2420, 2440, 2464, 2480 };
int cur_bb_spur, negative = 0, cck_spur_freq;
int i;
@@ -1161,7 +1161,7 @@ static void ar9003_hw_set_radar_conf(struct ath_hw *ah)
void ar9003_hw_attach_phy_ops(struct ath_hw *ah)
{
struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
- const u32 ar9300_cca_regs[6] = {
+ static const u32 ar9300_cca_regs[6] = {
AR_PHY_CCA_0,
AR_PHY_CCA_1,
AR_PHY_CCA_2,
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_4k.c b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
index c40c534..c2481b3 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_4k.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
@@ -534,7 +534,9 @@ static void ath9k_hw_set_4k_power_per_rate_table(struct ath_hw *ah,
u16 twiceMinEdgePower;
u16 twiceMaxEdgePower = AR5416_MAX_RATE_POWER;
u16 scaledPower = 0, minCtlPower, maxRegAllowedPower;
- u16 numCtlModes, *pCtlMode, ctlMode, freq;
+ u16 numCtlModes;
+ const u16 *pCtlMode;
+ u16 ctlMode, freq;
struct chan_centers centers;
struct cal_ctl_data_4k *rep;
struct ar5416_eeprom_4k *pEepData = &ah->eeprom.map4k;
@@ -550,10 +552,10 @@ static void ath9k_hw_set_4k_power_per_rate_table(struct ath_hw *ah,
struct cal_target_power_ht targetPowerHt20, targetPowerHt40 = {
0, {0, 0, 0, 0}
};
- u16 ctlModesFor11g[] =
- { CTL_11B, CTL_11G, CTL_2GHT20, CTL_11B_EXT, CTL_11G_EXT,
- CTL_2GHT40
- };
+ static const u16 ctlModesFor11g[] = {
+ CTL_11B, CTL_11G, CTL_2GHT20,
+ CTL_11B_EXT, CTL_11G_EXT, CTL_2GHT40
+ };
ath9k_hw_get_channel_centers(ah, chan, ¢ers);
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_9287.c b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
index 3ad1de2..e756978 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_9287.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_9287.c
@@ -626,13 +626,13 @@ static void ath9k_hw_set_ar9287_power_per_rate_table(struct ath_hw *ah,
struct cal_target_power_ht targetPowerHt20,
targetPowerHt40 = {0, {0, 0, 0, 0} };
u16 scaledPower = 0, minCtlPower, maxRegAllowedPower;
- u16 ctlModesFor11g[] = {CTL_11B,
- CTL_11G,
- CTL_2GHT20,
- CTL_11B_EXT,
- CTL_11G_EXT,
- CTL_2GHT40};
- u16 numCtlModes = 0, *pCtlMode = NULL, ctlMode, freq;
+ static const u16 ctlModesFor11g[] = {
+ CTL_11B, CTL_11G, CTL_2GHT20,
+ CTL_11B_EXT, CTL_11G_EXT, CTL_2GHT40
+ };
+ u16 numCtlModes = 0;
+ const u16 *pCtlMode = NULL;
+ u16 ctlMode, freq;
struct chan_centers centers;
int tx_chainmask;
u16 twiceMinEdgePower;
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_def.c b/drivers/net/wireless/ath/ath9k/eeprom_def.c
index a819ddc..e94216e 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_def.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c
@@ -1021,13 +1021,16 @@ static void ath9k_hw_set_def_power_per_rate_table(struct ath_hw *ah,
0, {0, 0, 0, 0}
};
u16 scaledPower = 0, minCtlPower, maxRegAllowedPower;
- u16 ctlModesFor11a[] =
- { CTL_11A, CTL_5GHT20, CTL_11A_EXT, CTL_5GHT40 };
- u16 ctlModesFor11g[] =
- { CTL_11B, CTL_11G, CTL_2GHT20, CTL_11B_EXT, CTL_11G_EXT,
- CTL_2GHT40
- };
- u16 numCtlModes, *pCtlMode, ctlMode, freq;
+ static const u16 ctlModesFor11a[] = {
+ CTL_11A, CTL_5GHT20, CTL_11A_EXT, CTL_5GHT40
+ };
+ static const u16 ctlModesFor11g[] = {
+ CTL_11B, CTL_11G, CTL_2GHT20,
+ CTL_11B_EXT, CTL_11G_EXT, CTL_2GHT40
+ };
+ u16 numCtlModes;
+ const u16 *pCtlMode;
+ u16 ctlMode, freq;
struct chan_centers centers;
int tx_chainmask;
u16 twiceMinEdgePower;
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index 7c8a38d..7f2704d 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -308,7 +308,7 @@ static void ath9k_regwrite_single(void *hw_priv, u32 val, u32 reg_offset)
struct ath_hw *ah = (struct ath_hw *) hw_priv;
struct ath_common *common = ath9k_hw_common(ah);
struct ath9k_htc_priv *priv = (struct ath9k_htc_priv *) common->priv;
- __be32 buf[2] = {
+ const __be32 buf[2] = {
cpu_to_be32(reg_offset),
cpu_to_be32(val),
};
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 1dbe53b..c6e971a 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -310,10 +310,9 @@ static bool ath9k_hw_chip_test(struct ath_hw *ah)
struct ath_common *common = ath9k_hw_common(ah);
u32 regAddr[2] = { AR_STA_ID0 };
u32 regHold[2];
- u32 patternData[4] = { 0x55555555,
- 0xaaaaaaaa,
- 0x66666666,
- 0x99999999 };
+ static const u32 patternData[4] = {
+ 0x55555555, 0xaaaaaaaa, 0x66666666, 0x99999999
+ };
int i, j, loop_max;
if (!AR_SREV_9300_20_OR_LATER(ah)) {
@@ -436,7 +435,7 @@ static int ath9k_hw_init_macaddr(struct ath_hw *ah)
u32 sum;
int i;
u16 eeval;
- u32 EEP_MAC[] = { EEP_MAC_LSW, EEP_MAC_MID, EEP_MAC_MSW };
+ static const u32 EEP_MAC[] = { EEP_MAC_LSW, EEP_MAC_MID, EEP_MAC_MSW };
sum = 0;
for (i = 0; i < 3; i++) {
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c
index 33bb33b..ee4566d 100644
--- a/drivers/net/wireless/ath/ath9k/rc.c
+++ b/drivers/net/wireless/ath/ath9k/rc.c
@@ -864,7 +864,7 @@ static bool ath_rc_update_per(struct ath_softc *sc,
bool state_change = false;
int count, n_bad_frames;
u8 last_per;
- static u32 nretry_to_per_lookup[10] = {
+ static const u32 nretry_to_per_lookup[10] = {
100 * 0 / 1,
100 * 1 / 4,
100 * 1 / 2,
@@ -1087,13 +1087,13 @@ static int ath_rc_get_rateindex(const struct ath_rate_table *rate_table,
struct ieee80211_tx_rate *rate)
{
int rix = 0, i = 0;
- int mcs_rix_off[] = { 7, 15, 20, 21, 22, 23 };
+ static const int mcs_rix_off[] = { 7, 15, 20, 21, 22, 23 };
if (!(rate->flags & IEEE80211_TX_RC_MCS))
return rate->idx;
while (rate->idx > mcs_rix_off[i] &&
- i < sizeof(mcs_rix_off)/sizeof(int)) {
+ i < ARRAY_SIZE(mcs_rix_off)) {
rix++; i++;
}
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 53/62] carl9170: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (50 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 52/62] ath9k: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
[not found] ` <cover.1290305773.git.joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
` (5 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Christian Lamparter
Cc: John W. Linville, linux-wireless, netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
1897 56 672 2625 a41 drivers/net/wireless/ath/carl9170/cmd.o.new
1897 56 672 2625 a41 drivers/net/wireless/ath/carl9170/cmd.o.old
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/wireless/ath/carl9170/cmd.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/ath/carl9170/cmd.c b/drivers/net/wireless/ath/carl9170/cmd.c
index c21f336..cdfc94c 100644
--- a/drivers/net/wireless/ath/carl9170/cmd.c
+++ b/drivers/net/wireless/ath/carl9170/cmd.c
@@ -41,7 +41,7 @@
int carl9170_write_reg(struct ar9170 *ar, const u32 reg, const u32 val)
{
- __le32 buf[2] = {
+ const __le32 buf[2] = {
cpu_to_le32(reg),
cpu_to_le32(val),
};
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread[parent not found: <cover.1290305773.git.joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>]
* [PATCH 46/62] usb: Use static const
[not found] ` <cover.1290305773.git.joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
@ 2010-11-21 2:38 ` Joe Perches
[not found] ` <ed2a5bd07f07601ba12ce3c8fcbce2dd954c35aa.1290305776.git.joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
2010-11-21 2:38 ` [PATCH 54/62] atmel: " Joe Perches
` (4 subsequent siblings)
5 siblings, 1 reply; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Jan Dumon, Greg Kroah-Hartman
Cc: linux-usb-u79uwXL29TY76Z2rM5mHXA, netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
36120 312 9000 45432 b178 drivers/net/usb/hso.o.old
36043 312 9008 45363 b133 drivers/net/usb/hso.o.new
Consolidate duplicated code into new fix_crc_bug function
and declare data in that function static const.
Signed-off-by: Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
---
drivers/net/usb/hso.c | 39 ++++++++++++++++-----------------------
1 files changed, 16 insertions(+), 23 deletions(-)
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index be8cc2a..c77d0ea 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -1001,6 +1001,18 @@ static void packetizeRx(struct hso_net *odev, unsigned char *ip_pkt,
}
}
+static void fix_crc_bug(struct urb *urb, __le16 max_packet_size)
+{
+ static const u8 crc_check[4] = { 0xDE, 0xAD, 0xBE, 0xEF };
+ u32 rest = urb->actual_length % le16_to_cpu(max_packet_size);
+
+ if (((rest == 5) || (rest == 6)) &&
+ !memcmp(((u8 *)urb->transfer_buffer) + urb->actual_length - 4,
+ crc_check, 4)) {
+ urb->actual_length -= 4;
+ }
+}
+
/* Moving data from usb to kernel (in interrupt state) */
static void read_bulk_callback(struct urb *urb)
{
@@ -1029,17 +1041,8 @@ static void read_bulk_callback(struct urb *urb)
return;
}
- if (odev->parent->port_spec & HSO_INFO_CRC_BUG) {
- u32 rest;
- u8 crc_check[4] = { 0xDE, 0xAD, 0xBE, 0xEF };
- rest = urb->actual_length %
- le16_to_cpu(odev->in_endp->wMaxPacketSize);
- if (((rest == 5) || (rest == 6)) &&
- !memcmp(((u8 *) urb->transfer_buffer) +
- urb->actual_length - 4, crc_check, 4)) {
- urb->actual_length -= 4;
- }
- }
+ if (odev->parent->port_spec & HSO_INFO_CRC_BUG)
+ fix_crc_bug(urb, odev->in_endp->wMaxPacketSize);
/* do we even have a packet? */
if (urb->actual_length) {
@@ -1231,18 +1234,8 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
return;
if (status == 0) {
- if (serial->parent->port_spec & HSO_INFO_CRC_BUG) {
- u32 rest;
- u8 crc_check[4] = { 0xDE, 0xAD, 0xBE, 0xEF };
- rest =
- urb->actual_length %
- le16_to_cpu(serial->in_endp->wMaxPacketSize);
- if (((rest == 5) || (rest == 6)) &&
- !memcmp(((u8 *) urb->transfer_buffer) +
- urb->actual_length - 4, crc_check, 4)) {
- urb->actual_length -= 4;
- }
- }
+ if (serial->parent->port_spec & HSO_INFO_CRC_BUG)
+ fix_crc_bug(urb, serial->in_endp->wMaxPacketSize);
/* Valid data, handle RX data */
spin_lock(&serial->serial_lock);
serial->rx_urb_filled[hso_urb_to_index(serial, urb)] = 1;
--
1.7.3.2.245.g03276.dirty
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 54/62] atmel: Use static const
[not found] ` <cover.1290305773.git.joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
2010-11-21 2:38 ` [PATCH 46/62] usb: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 56/62] iwlwifi: " Joe Perches
` (3 subsequent siblings)
5 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Simon Kelley, John W. Linville
Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA,
netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
42578 720 8528 51826 ca72 drivers/net/wireless/atmel.o.old
42578 720 8528 51826 ca72 drivers/net/wireless/atmel.o.new
Signed-off-by: Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
---
drivers/net/wireless/atmel.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index c8f7090..46e382e 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -1161,7 +1161,7 @@ static irqreturn_t service_interrupt(int irq, void *dev_id)
struct atmel_private *priv = netdev_priv(dev);
u8 isr;
int i = -1;
- static u8 irq_order[] = {
+ static const u8 irq_order[] = {
ISR_OUT_OF_RANGE,
ISR_RxCOMPLETE,
ISR_TxCOMPLETE,
@@ -3771,7 +3771,9 @@ static int probe_atmel_card(struct net_device *dev)
if (rc) {
if (dev->dev_addr[0] == 0xFF) {
- u8 default_mac[] = {0x00, 0x04, 0x25, 0x00, 0x00, 0x00};
+ static const u8 default_mac[] = {
+ 0x00, 0x04, 0x25, 0x00, 0x00, 0x00
+ };
printk(KERN_ALERT "%s: *** Invalid MAC address. UPGRADE Firmware ****\n", dev->name);
memcpy(dev->dev_addr, default_mac, 6);
}
--
1.7.3.2.245.g03276.dirty
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 56/62] iwlwifi: Use static const
[not found] ` <cover.1290305773.git.joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
2010-11-21 2:38 ` [PATCH 46/62] usb: " Joe Perches
2010-11-21 2:38 ` [PATCH 54/62] atmel: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
[not found] ` <2773a20a26f4e326f0849e8ae8fb4f347d6a6ecb.1290305776.git.joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
2010-11-21 2:38 ` [PATCH 58/62] ray_cs: " Joe Perches
` (2 subsequent siblings)
5 siblings, 1 reply; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Stefano Brivio, Reinette Chatre, Wey-Yi Guy, Intel Linux Wireless
Cc: John W. Linville, linux-wireless-u79uwXL29TY76Z2rM5mHXA,
netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
48644 57 12120 60821 ed95 drivers/net/wireless/b43/phy_n.o.new
48661 57 12120 60838 eda6 drivers/net/wireless/b43/phy_n.o.old
37906 86 7904 45896 b348 drivers/net/wireless/iwlwifi/iwl-agn-lib.o.new
37937 86 7904 45927 b367 drivers/net/wireless/iwlwifi/iwl-agn-lib.o.old
37781 523 6752 45056 b000 drivers/net/wireless/iwlwifi/iwl-3945.o.new
37781 523 6752 45056 b000 drivers/net/wireless/iwlwifi/iwl-3945.o.old
Changed b43_nphy_write_clip_detection to take a const u16 *
Signed-off-by: Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
---
drivers/net/wireless/b43/phy_n.c | 9 +++++----
drivers/net/wireless/iwlwifi/iwl-3945.c | 2 +-
drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 6 +++---
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c
index 6facb8a..afbfdf0 100644
--- a/drivers/net/wireless/b43/phy_n.c
+++ b/drivers/net/wireless/b43/phy_n.c
@@ -655,7 +655,8 @@ static void b43_nphy_tx_iq_workaround(struct b43_wldev *dev)
}
/* http://bcm-v4.sipsolutions.net/802.11/PHY/N/clip-detection */
-static void b43_nphy_write_clip_detection(struct b43_wldev *dev, u16 *clip_st)
+static void b43_nphy_write_clip_detection(struct b43_wldev *dev,
+ const u16 *clip_st)
{
b43_phy_write(dev, B43_NPHY_C1_CLIP1THRES, clip_st[0]);
b43_phy_write(dev, B43_NPHY_C2_CLIP1THRES, clip_st[1]);
@@ -731,7 +732,7 @@ static void b43_nphy_stay_in_carrier_search(struct b43_wldev *dev, bool enable)
struct b43_phy_n *nphy = phy->n;
if (enable) {
- u16 clip[] = { 0xFFFF, 0xFFFF };
+ static const u16 clip[] = { 0xFFFF, 0xFFFF };
if (nphy->deaf_count++ == 0) {
nphy->classifier_state = b43_nphy_classifier(dev, 0, 0);
b43_nphy_classifier(dev, 0x7, 0);
@@ -843,7 +844,7 @@ static void b43_nphy_adjust_lna_gain_table(struct b43_wldev *dev)
u16 data[4];
s16 gain[2];
u16 minmax[2];
- u16 lna_gain[4] = { -2, 10, 19, 25 };
+ static const u16 lna_gain[4] = { -2, 10, 19, 25 };
if (nphy->hang_avoid)
b43_nphy_stay_in_carrier_search(dev, 1);
@@ -2299,7 +2300,7 @@ static void b43_nphy_int_pa_set_tx_dig_filters(struct b43_wldev *dev)
{
int i, j;
/* B43_NPHY_TXF_20CO_S0A1, B43_NPHY_TXF_40CO_S0A1, unknown */
- u16 offset[] = { 0x186, 0x195, 0x2C5 };
+ static const u16 offset[] = { 0x186, 0x195, 0x2C5 };
for (i = 0; i < 3; i++)
for (j = 0; j < 15; j++)
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index ebac04b..013c5a9 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -116,7 +116,7 @@ void iwl3945_disable_events(struct iwl_priv *priv)
u32 base; /* SRAM address of event log header */
u32 disable_ptr; /* SRAM address of event-disable bitmap array */
u32 array_size; /* # of u32 entries in array */
- u32 evt_disable[IWL_EVT_DISABLE_SIZE] = {
+ static const u32 evt_disable[IWL_EVT_DISABLE_SIZE] = {
0x00000000, /* 31 - 0 Event id numbers */
0x00000000, /* 63 - 32 */
0x00000000, /* 95 - 64 */
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index ca3530c..75e808f 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -2001,7 +2001,7 @@ static void iwlagn_set_kill_ack_msk(struct iwl_priv *priv,
struct iwl_bt_uart_msg *uart_msg)
{
u8 kill_ack_msk;
- __le32 bt_kill_ack_msg[2] = {
+ static const __le32 bt_kill_ack_msg[2] = {
cpu_to_le32(0xFFFFFFF), cpu_to_le32(0xFFFFFC00) };
kill_ack_msk = (((BT_UART_MSG_FRAME3A2DP_MSK |
@@ -2287,7 +2287,7 @@ static const char *get_csr_string(int cmd)
void iwl_dump_csr(struct iwl_priv *priv)
{
int i;
- u32 csr_tbl[] = {
+ static const u32 csr_tbl[] = {
CSR_HW_IF_CONFIG_REG,
CSR_INT_COALESCING,
CSR_INT,
@@ -2346,7 +2346,7 @@ int iwl_dump_fh(struct iwl_priv *priv, char **buf, bool display)
int pos = 0;
size_t bufsz = 0;
#endif
- u32 fh_tbl[] = {
+ static const u32 fh_tbl[] = {
FH_RSCSR_CHNL0_STTS_WPTR_REG,
FH_RSCSR_CHNL0_RBDCB_BASE_REG,
FH_RSCSR_CHNL0_WPTR,
--
1.7.3.2.245.g03276.dirty
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 58/62] ray_cs: Use static const
[not found] ` <cover.1290305773.git.joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
` (2 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 56/62] iwlwifi: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:39 ` [PATCH 62/62] zd1211rw: Use const Joe Perches
2010-11-21 4:50 ` [PATCH 00/62] drivers/net: Use static const David Miller
5 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: John W. Linville
Cc: linux-wireless-u79uwXL29TY76Z2rM5mHXA,
netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
42607 3581 8536 54724 d5c4 drivers/net/wireless/ray_cs.o.new
42603 3585 8536 54724 d5c4 drivers/net/wireless/ray_cs.o.old
Signed-off-by: Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
---
drivers/net/wireless/ray_cs.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 97007d9..2b1cbba 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -2286,8 +2286,8 @@ static void untranslate(ray_dev_t *local, struct sk_buff *skb, int len)
struct ethhdr *peth;
UCHAR srcaddr[ADDRLEN];
UCHAR destaddr[ADDRLEN];
- static UCHAR org_bridge[3] = { 0, 0, 0xf8 };
- static UCHAR org_1042[3] = { 0, 0, 0 };
+ static const UCHAR org_bridge[3] = { 0, 0, 0xf8 };
+ static const UCHAR org_1042[3] = { 0, 0, 0 };
memcpy(destaddr, ieee80211_get_DA(pmac), ADDRLEN);
memcpy(srcaddr, ieee80211_get_SA(pmac), ADDRLEN);
--
1.7.3.2.245.g03276.dirty
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 62/62] zd1211rw: Use const
[not found] ` <cover.1290305773.git.joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
` (3 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 58/62] ray_cs: " Joe Perches
@ 2010-11-21 2:39 ` Joe Perches
2010-11-21 4:50 ` [PATCH 00/62] drivers/net: Use static const David Miller
5 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:39 UTC (permalink / raw)
To: Daniel Drake, Ulrich Kunitz
Cc: John W. Linville, linux-wireless-u79uwXL29TY76Z2rM5mHXA,
netdev-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
Mark arrays const that are unmodified after initializations.
text data bss dec hex filename
19291 56 4136 23483 5bbb drivers/net/wireless/zd1211rw/zd_chip.o.old
19291 56 4136 23483 5bbb drivers/net/wireless/zd1211rw/zd_chip.o.new
Signed-off-by: Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
---
drivers/net/wireless/zd1211rw/zd_chip.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
index 87a95bc..30f8d40 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.c
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -1448,7 +1448,7 @@ int zd_rfwritev_locked(struct zd_chip *chip,
*/
int zd_rfwrite_cr_locked(struct zd_chip *chip, u32 value)
{
- struct zd_ioreq16 ioreqs[] = {
+ const struct zd_ioreq16 ioreqs[] = {
{ CR244, (value >> 16) & 0xff },
{ CR243, (value >> 8) & 0xff },
{ CR242, value & 0xff },
@@ -1475,7 +1475,7 @@ int zd_rfwritev_cr_locked(struct zd_chip *chip,
int zd_chip_set_multicast_hash(struct zd_chip *chip,
struct zd_mc_hash *hash)
{
- struct zd_ioreq32 ioreqs[] = {
+ const struct zd_ioreq32 ioreqs[] = {
{ CR_GROUP_HASH_P1, hash->low },
{ CR_GROUP_HASH_P2, hash->high },
};
--
1.7.3.2.245.g03276.dirty
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 76+ messages in thread* Re: [PATCH 00/62] drivers/net: Use static const
[not found] ` <cover.1290305773.git.joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
` (4 preceding siblings ...)
2010-11-21 2:39 ` [PATCH 62/62] zd1211rw: Use const Joe Perches
@ 2010-11-21 4:50 ` David Miller
2010-11-22 22:10 ` Joe Perches
5 siblings, 1 reply; 76+ messages in thread
From: David Miller @ 2010-11-21 4:50 UTC (permalink / raw)
To: joe-6d6DIl74uiNBDgjK7y7TUQ
Cc: ath5k-devel-xDcbHBWguxEUs3QNXV6qNA,
libertas-dev-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
e1000-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
netdev-u79uwXL29TY76Z2rM5mHXA, linux-usb-u79uwXL29TY76Z2rM5mHXA,
linux-wireless-u79uwXL29TY76Z2rM5mHXA,
users-poMEt7QlJxcwIE2E9O76wjtx2kNaKg5H,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
socketcan-core-0fE9KPoRgkgATYTw5x5z8w,
ath9k-devel-xDcbHBWguxHbcTqmT+pZeQ
From: Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
Date: Sat, 20 Nov 2010 18:38:01 -0800
> Using static const generally increases object text and decreases data size.
> It also generally decreases overall object size.
Joe, I'm going to be frank and say that I'm not going to review and
apply such a large chunk of networking patches.
Seperation is cool, splitting up patches is cool to make review
perhaps easier and more distributed.
But in the end _I_ have to purge through these things and submitting
so many patches at a time, multiple times per release cycle, abuses me
as a resource.
Yes, Linus has to deal with perhaps a hundred patches, or more, at a
time from Andrew Morton during the merge window. But he has to do
that _ONE_ time each release. You crap large sets of patches on me
multiple times per release cycle.
This cannot continue, my sanity depends upon it.
You therefore cannot funnel 40, 50, 60, or more patches at me at a
time, multiple times per release. It severely negatively effects my
mood, because it makes me feel like me head is below water again
_RIGHT_ after I've worked all damn week to finally made the networking
patch backlog sane again.
You also make this more difficult for me by not using GIT. Even
with patchwork helping me significantly, it's still a lot of work
to apply large sets of patches. If I had to take in John Linville's
wireless stuff without GIT I'd be banging my head on a wall.
And these incessant huge patch bombs also take time away from me for
the things I'd like to at least occiasionally work on that involve
more intellect than monkeying around with such mindless patches.
Thanks for your understanding. Feel free to submit this stuff in
smaller chunks, say ~10 patches at a time.
^ permalink raw reply [flat|nested] 76+ messages in thread* Re: [PATCH 00/62] drivers/net: Use static const
2010-11-21 4:50 ` [PATCH 00/62] drivers/net: Use static const David Miller
@ 2010-11-22 22:10 ` Joe Perches
2010-11-22 22:19 ` David Miller
0 siblings, 1 reply; 76+ messages in thread
From: Joe Perches @ 2010-11-22 22:10 UTC (permalink / raw)
To: David Miller
Cc: ath5k-devel, libertas-dev, e1000-devel, netdev, linux-usb,
linux-wireless, users, linux-kernel, socketcan-core, ath9k-devel
On Sat, 2010-11-20 at 20:50 -0800, David Miller wrote:
> From: Joe Perches <joe@perches.com>
> Date: Sat, 20 Nov 2010 18:38:01 -0800
>
> > Using static const generally increases object text and decreases data size.
> > It also generally decreases overall object size.
>
> Joe, I'm going to be frank and say that I'm not going to review and
> apply such a large chunk of networking patches.
Hi David. No worries.
> Separation is cool, splitting up patches is cool to make review
> perhaps easier and more distributed.
I know you have ownership of netdev. Thanks for doing all that
work. You may not get enough feedback on the very good job that
you do at it.
I posted these patches not so much to get you to immediately pick
them up, but to get review from and/or notify the maintainers of
each of these subsystems. I would have submitted them to Jiri
Kosina/trivial, but he asked me to post and track these style
patches separately and wait for a few weeks before submitting any
remaining patches not picked up by maintainers to him.
> It severely negatively effects my mood,
Can't have that...
> You also make this more difficult for me by not using GIT.
I do of course use git locally. I have a public tree as well,
but I hardly update it. I updated it recently for this.
These patches are available in:
git://repo.or.cz/linux-2.6/trivial-mods.git 20101121_net_next_static_const
Perhaps I should ask Stephen Rothwell to include some trivial tree
branch like this in next.
> Even with patchwork helping me significantly, it's still a lot of work
> to apply large sets of patches.
I think that cc'ing netdev is always appropriate for netdev patches, but
maybe trivial@kernel.org could become linux-trivial@vger.kernel.org or
something like that.
Perhaps there could be some way to automatically mark these exceptionally
trivial patches as something like "not applicable" so they don't appear
on your personal queue.
> If I had to take in John Linville's
> wireless stuff without GIT I'd be banging my head on a wall.
>
> And these incessant huge patch bombs also take time away from me for
> the things I'd like to at least occiasionally work on that involve
> more intellect than monkeying around with such mindless patches.
Establishing trust is always a long term thing.
Breaking trust is easy too.
Anyway, I think these patches are obvious and correct and can be
directly applied without significant risk.
I think the the issues are:
o should the nominal maintainers of the subsystems pick them up
o should these subsystem maintainers should be bypassed
o should the subsystem mailing lists be cc'd
o should these be pulled as a single changeset or multiples
I think that getting the nominal subsystem maintainers involved
is good, but perhaps not too necessary for these sorts of patches.
btw: it doesn't seem that, other than John Linville for wireless,
you currently pull from many (any?) other people. Do let me know
if you'd consider pulling these sorts of changes from me.
$ git log --merges --since=2-years-ago drivers/net | grep "^Author: " | sort | uniq -c | sort -rn
259 Author: David S. Miller <davem@davemloft.net>
201 Author: Linus Torvalds <torvalds@linux-foundation.org>
45 Author: John W. Linville <linville@tuxdriver.com>
15 Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
15 Author: Ingo Molnar <mingo@elte.hu>
14 Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
7 Author: Russell King <rmk+kernel@arm.linux.org.uk>
6 Author: Jiri Kosina <jkosina@suse.cz>
4 Author: Reinette Chatre <reinette.chatre@intel.com>
3 Author: Roland Dreier <rolandd@cisco.com>
3 Author: James Morris <jmorris@namei.org>
2 Author: Tony Lindgren <tony@atomide.com>
2 Author: Grant Likely <grant.likely@secretlab.ca>
1 Author: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
1 Author: root <root@dyn-67.arm.linux.org.uk>
1 Author: Paul Mackerras <paulus@samba.org>
1 Author: Kevin Hilman <khilman@deeprootsystems.com>
1 Author: James Bottomley <James.Bottomley@HansenPartnership.com>
> Thanks for your understanding. Feel free to submit this stuff in
> smaller chunks, say ~10 patches at a time.
Let me know if you want to pull or want them in smaller chunks in
say a month from now.
cheers, Joe
------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
^ permalink raw reply [flat|nested] 76+ messages in thread* Re: [PATCH 00/62] drivers/net: Use static const
2010-11-22 22:10 ` Joe Perches
@ 2010-11-22 22:19 ` David Miller
2010-11-22 22:40 ` Joe Perches
0 siblings, 1 reply; 76+ messages in thread
From: David Miller @ 2010-11-22 22:19 UTC (permalink / raw)
To: joe-6d6DIl74uiNBDgjK7y7TUQ
Cc: ath5k-devel-xDcbHBWguxEUs3QNXV6qNA,
libertas-dev-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
e1000-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
netdev-u79uwXL29TY76Z2rM5mHXA, linux-usb-u79uwXL29TY76Z2rM5mHXA,
linux-wireless-u79uwXL29TY76Z2rM5mHXA,
users-poMEt7QlJxcwIE2E9O76wjtx2kNaKg5H,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
socketcan-core-0fE9KPoRgkgATYTw5x5z8w,
ath9k-devel-xDcbHBWguxHbcTqmT+pZeQ
From: Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
Date: Mon, 22 Nov 2010 14:10:46 -0800
> btw: it doesn't seem that, other than John Linville for wireless,
> you currently pull from many (any?) other people. Do let me know
> if you'd consider pulling these sorts of changes from me.
Expand your horizon beyond drivers/net/ and into places like net/
and you'll see I also pull from people like Patrick McHardy, for
example.
^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH 00/62] drivers/net: Use static const
2010-11-22 22:19 ` David Miller
@ 2010-11-22 22:40 ` Joe Perches
2010-11-23 16:28 ` David Miller
0 siblings, 1 reply; 76+ messages in thread
From: Joe Perches @ 2010-11-22 22:40 UTC (permalink / raw)
To: David Miller
Cc: ath5k-devel, libertas-dev, e1000-devel, netdev, linux-usb,
linux-wireless, users, linux-kernel, socketcan-core, ath9k-devel
On Mon, 2010-11-22 at 14:19 -0800, David Miller wrote:
> From: Joe Perches <joe@perches.com>
> Date: Mon, 22 Nov 2010 14:10:46 -0800
> > Do let me know if you'd consider pulling these sorts of
> > changes from me.
> Expand your horizon beyond drivers/net/ and into places like net/
> and you'll see I also pull from people like Patrick McHardy, for
> example.
I'll see who picks up or acks what and send a pull request to
you for the remainder of these patches mid December or so.
Do you want micro patches or a single patch?
------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
^ permalink raw reply [flat|nested] 76+ messages in thread
* Re: [PATCH 00/62] drivers/net: Use static const
2010-11-22 22:40 ` Joe Perches
@ 2010-11-23 16:28 ` David Miller
0 siblings, 0 replies; 76+ messages in thread
From: David Miller @ 2010-11-23 16:28 UTC (permalink / raw)
To: joe-6d6DIl74uiNBDgjK7y7TUQ
Cc: ath5k-devel-xDcbHBWguxEUs3QNXV6qNA,
libertas-dev-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
e1000-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f,
netdev-u79uwXL29TY76Z2rM5mHXA, linux-usb-u79uwXL29TY76Z2rM5mHXA,
linux-wireless-u79uwXL29TY76Z2rM5mHXA,
users-poMEt7QlJxcwIE2E9O76wjtx2kNaKg5H,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
socketcan-core-0fE9KPoRgkgATYTw5x5z8w,
ath9k-devel-xDcbHBWguxHbcTqmT+pZeQ
From: Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
Date: Mon, 22 Nov 2010 14:40:05 -0800
> I'll see who picks up or acks what and send a pull request to
> you for the remainder of these patches mid December or so.
Thanks.
> Do you want micro patches or a single patch?
You can group them by directory or similar if you like.
F.e.:
Patch 1: drivers/net/*.c
Patch 2: drivers/net/*/*.c (wired drivers)
Patch 3: drivers/net/wireless/*
Thanks again.
^ permalink raw reply [flat|nested] 76+ messages in thread
* [PATCH 55/62] b43: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (52 preceding siblings ...)
[not found] ` <cover.1290305773.git.joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:38 ` [PATCH 57/62] libertas: " Joe Perches
` (3 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Stefano Brivio; +Cc: John W. Linville, linux-wireless, netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
5502 56 1336 6894 1aee drivers/net/wireless/b43/phy_common.o.new
5511 56 1336 6903 1af7 drivers/net/wireless/b43/phy_common.o.old
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/wireless/b43/phy_common.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/b43/phy_common.c b/drivers/net/wireless/b43/phy_common.c
index 7b2ea67..fa7f83f 100644
--- a/drivers/net/wireless/b43/phy_common.c
+++ b/drivers/net/wireless/b43/phy_common.c
@@ -427,9 +427,11 @@ void b43_phyop_switch_analog_generic(struct b43_wldev *dev, bool on)
/* http://bcm-v4.sipsolutions.net/802.11/PHY/Cordic */
struct b43_c32 b43_cordic(int theta)
{
- u32 arctg[] = { 2949120, 1740967, 919879, 466945, 234379, 117304,
- 58666, 29335, 14668, 7334, 3667, 1833, 917, 458,
- 229, 115, 57, 29, };
+ static const u32 arctg[] = {
+ 2949120, 1740967, 919879, 466945, 234379, 117304,
+ 58666, 29335, 14668, 7334, 3667, 1833,
+ 917, 458, 229, 115, 57, 29,
+ };
u8 i;
s32 tmp;
s8 signx = 1;
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 57/62] libertas: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (53 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 55/62] b43: " Joe Perches
@ 2010-11-21 2:38 ` Joe Perches
2010-11-21 2:39 ` [PATCH 59/62] rndis_wlan: " Joe Perches
` (2 subsequent siblings)
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:38 UTC (permalink / raw)
To: Dan Williams
Cc: John W. Linville, libertas-dev, linux-wireless, netdev,
linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
3650 56 704 4410 113a drivers/net/wireless/libertas/rx.o.new
3695 56 704 4455 1167 drivers/net/wireless/libertas/rx.o.old
27328 964 5240 33532 82fc drivers/net/wireless/libertas/cfg.o.new
27328 964 5240 33532 82fc drivers/net/wireless/libertas/cfg.o.old
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/wireless/libertas/cfg.c | 2 +-
drivers/net/wireless/libertas/rx.c | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c
index 373930a..3f21fcb 100644
--- a/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
@@ -2062,7 +2062,7 @@ static void lbs_cfg_set_regulatory_hint(struct lbs_private *priv)
};
/* Section 5.17.2 */
- static struct region_code_mapping regmap[] = {
+ static const struct region_code_mapping regmap[] = {
{"US ", 0x10}, /* US FCC */
{"CA ", 0x20}, /* Canada */
{"EU ", 0x30}, /* ETSI */
diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c
index a4d0bca..a2b1df2 100644
--- a/drivers/net/wireless/libertas/rx.c
+++ b/drivers/net/wireless/libertas/rx.c
@@ -55,7 +55,9 @@ int lbs_process_rxed_packet(struct lbs_private *priv, struct sk_buff *skb)
struct rxpd *p_rx_pd;
int hdrchop;
struct ethhdr *p_ethhdr;
- const u8 rfc1042_eth_hdr[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
+ static const u8 rfc1042_eth_hdr[] = {
+ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00
+ };
lbs_deb_enter(LBS_DEB_RX);
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 59/62] rndis_wlan: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (54 preceding siblings ...)
2010-11-21 2:38 ` [PATCH 57/62] libertas: " Joe Perches
@ 2010-11-21 2:39 ` Joe Perches
2010-11-21 2:39 ` [PATCH 60/62] rt2x00: " Joe Perches
2010-11-21 2:39 ` [PATCH 61/62] wl12xx: " Joe Perches
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:39 UTC (permalink / raw)
To: Jussi Kivilinna, John W. Linville; +Cc: linux-wireless, netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
41757 2205 9896 53858 d262 drivers/net/wireless/rndis_wlan.o.old
41653 2205 9880 53738 d1ea drivers/net/wireless/rndis_wlan.o.new
Changed functions rndis_set_oid and set_bssid to take const *'s.
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/wireless/rndis_wlan.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index ee08bca..19f3d56 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -817,7 +817,8 @@ exit_unlock:
return ret;
}
-static int rndis_set_oid(struct usbnet *dev, __le32 oid, void *data, int len)
+static int rndis_set_oid(struct usbnet *dev, __le32 oid, const void *data,
+ int len)
{
struct rndis_wlan_private *priv = get_rndis_wlan_priv(dev);
union {
@@ -1033,7 +1034,7 @@ static int set_essid(struct usbnet *usbdev, struct ndis_80211_ssid *ssid)
return ret;
}
-static int set_bssid(struct usbnet *usbdev, u8 bssid[ETH_ALEN])
+static int set_bssid(struct usbnet *usbdev, const u8 *bssid)
{
int ret;
@@ -1049,7 +1050,9 @@ static int set_bssid(struct usbnet *usbdev, u8 bssid[ETH_ALEN])
static int clear_bssid(struct usbnet *usbdev)
{
- u8 broadcast_mac[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+ static const u8 broadcast_mac[ETH_ALEN] = {
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+ };
return set_bssid(usbdev, broadcast_mac);
}
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 60/62] rt2x00: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (55 preceding siblings ...)
2010-11-21 2:39 ` [PATCH 59/62] rndis_wlan: " Joe Perches
@ 2010-11-21 2:39 ` Joe Perches
[not found] ` <d8bfaded20da2265673391a81536d63b0e81dc7f.1290305776.git.joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
2010-11-21 2:39 ` [PATCH 61/62] wl12xx: " Joe Perches
57 siblings, 1 reply; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:39 UTC (permalink / raw)
To: Ivo van Doorn, Gertjan van Wingerde
Cc: John W. Linville, linux-wireless, users, netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
40197 56 8336 48589 bdcd drivers/net/wireless/rt2x00/rt2800lib.o.new
40205 56 8336 48597 bdd5 drivers/net/wireless/rt2x00/rt2800lib.o.old
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/wireless/rt2x00/rt2800lib.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index ce8df66..7563161 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -2166,7 +2166,7 @@ static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
SHARED_KEY_MODE_ENTRY(i), 0);
for (i = 0; i < 256; i++) {
- u32 wcid[2] = { 0xffffffff, 0x00ffffff };
+ static const u32 wcid[2] = { 0xffffffff, 0x00ffffff };
rt2800_register_multiwrite(rt2x00dev, MAC_WCID_ENTRY(i),
wcid, sizeof(wcid));
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread* [PATCH 61/62] wl12xx: Use static const
2010-11-21 2:38 [PATCH 00/62] drivers/net: Use static const Joe Perches
` (56 preceding siblings ...)
2010-11-21 2:39 ` [PATCH 60/62] rt2x00: " Joe Perches
@ 2010-11-21 2:39 ` Joe Perches
57 siblings, 0 replies; 76+ messages in thread
From: Joe Perches @ 2010-11-21 2:39 UTC (permalink / raw)
To: Luciano Coelho; +Cc: John W. Linville, linux-wireless, netdev, linux-kernel
Using static const generally increases object text and decreases data size.
It also generally decreases overall object size.
text data bss dec hex filename
13071 56 2880 16007 3e87 drivers/net/wireless/wl12xx/wl1271_acx.o.old
13071 56 2880 16007 3e87 drivers/net/wireless/wl12xx/wl1271_acx.o.new
Signed-off-by: Joe Perches <joe@perches.com>
---
drivers/net/wireless/wl12xx/wl1271_acx.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/wl1271_acx.c b/drivers/net/wireless/wl12xx/wl1271_acx.c
index bd7f95f..c688471 100644
--- a/drivers/net/wireless/wl12xx/wl1271_acx.c
+++ b/drivers/net/wireless/wl12xx/wl1271_acx.c
@@ -1231,7 +1231,9 @@ int wl1271_acx_set_ht_capabilities(struct wl1271 *wl,
bool allow_ht_operation)
{
struct wl1271_acx_ht_capabilities *acx;
- u8 mac_address[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+ static const u8 mac_address[ETH_ALEN] = {
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+ };
int ret = 0;
wl1271_debug(DEBUG_ACX, "acx ht capabilities setting");
--
1.7.3.2.245.g03276.dirty
^ permalink raw reply related [flat|nested] 76+ messages in thread