bnx2: Use const on flash_table structure.
authorMichael Chan <mchan@broadcom.com>
Fri, 21 Aug 2009 16:20:49 +0000 (16:20 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sun, 23 Aug 2009 00:48:54 +0000 (17:48 -0700)
The structure, once initialized, never changes.

Signed-off-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bnx2.c
drivers/net/bnx2.h

index ea6e6b73f494b6a86b197d3036c26e127cf09f94..58ab3f4fa5f3b4734de8eb418e818f8e658ec0c7 100644 (file)
@@ -145,7 +145,7 @@ static DEFINE_PCI_DEVICE_TABLE(bnx2_pci_tbl) = {
        { 0, }
 };
 
-static struct flash_spec flash_table[] =
+static const struct flash_spec flash_table[] =
 {
 #define BUFFERED_FLAGS         (BNX2_NV_BUFFERED | BNX2_NV_TRANSLATE)
 #define NONBUFFERED_FLAGS      (BNX2_NV_WREN)
@@ -234,7 +234,7 @@ static struct flash_spec flash_table[] =
         "Buffered flash (256kB)"},
 };
 
-static struct flash_spec flash_5709 = {
+static const struct flash_spec flash_5709 = {
        .flags          = BNX2_NV_BUFFERED,
        .page_bits      = BCM5709_FLASH_PAGE_BITS,
        .page_size      = BCM5709_FLASH_PAGE_SIZE,
@@ -4227,7 +4227,7 @@ bnx2_init_nvram(struct bnx2 *bp)
 {
        u32 val;
        int j, entry_count, rc = 0;
-       struct flash_spec *flash;
+       const struct flash_spec *flash;
 
        if (CHIP_NUM(bp) == CHIP_NUM_5709) {
                bp->flash_info = &flash_5709;
index 3c004b44cf7eb11832897df28c319b5849f552ec..7544188b6541970d2a43857e8b19c6bfdbd60f1a 100644 (file)
@@ -6889,7 +6889,7 @@ struct bnx2 {
        int                     pm_cap;
        int                     pcix_cap;
 
-       struct flash_spec       *flash_info;
+       const struct flash_spec *flash_info;
        u32                     flash_size;
 
        int                     status_stats_size;