Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f71e1309 authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Jeff Garzik
Browse files

Massive net driver const-ification.

parent c499ec24

drivers/net/3c59x.c

+2 −2
Original line number Diff line number Diff line
@@ -841,7 +841,7 @@ enum xcvr_types { 
	XCVR_100baseFx, XCVR_MII=6, XCVR_NWAY=8, XCVR_ExtMII=9, XCVR_Default=10,

};



static struct media_table {

static const struct media_table {

	char *name;

	unsigned int media_bits:16,		/* Bits to set in Wn4_Media register. */

		mask:8,						/* The transceiver-present bit in Wn3_Config.*/
@@ -1445,7 +1445,7 @@ static int __devinit vortex_probe1(struct device *gendev, 
	}



	{

		static const char * ram_split[] = {"5:3", "3:1", "1:1", "3:5"};

		static const char * const ram_split[] = {"5:3", "3:1", "1:1", "3:5"};

		unsigned int config;

		EL3WINDOW(3);

		vp->available_media = ioread16(ioaddr + Wn3_Options);

drivers/net/8139cp.c

+1 −1
Original line number Diff line number Diff line
@@ -1276,7 +1276,7 @@ static int cp_change_mtu(struct net_device *dev, int new_mtu) 
}

#endif /* BROKEN */



static char mii_2_8139_map[8] = {

static const char mii_2_8139_map[8] = {

	BasicModeCtrl,

	BasicModeStatus,

	0,

drivers/net/8139too.c

+2 −2
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ typedef enum { 




/* indexed by board_t, above */

static struct {

static const struct {

	const char *name;

	u32 hw_flags;

} board_info[] __devinitdata = {
@@ -1192,7 +1192,7 @@ static int __devinit read_eeprom (void __iomem *ioaddr, int location, int addr_l 
#define mdio_delay()	RTL_R8(Config4)





static char mii_2_8139_map[8] = {

static const char mii_2_8139_map[8] = {

	BasicModeCtrl,

	BasicModeStatus,

	0,

drivers/net/bnx2.c

+5 −5
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ typedef enum { 
} board_t;



/* indexed by board_t, above */

static struct {

static const struct {

	char *name;

} board_info[] __devinitdata = {

	{ "Broadcom NetXtreme II BCM5706 1000Base-T" },
@@ -3476,7 +3476,7 @@ bnx2_test_registers(struct bnx2 *bp) 
{

	int ret;

	int i;

	static struct {

	static const struct {

		u16   offset;

		u16   flags;

		u32   rw_mask;
@@ -3891,7 +3891,7 @@ bnx2_test_registers(struct bnx2 *bp) 
static int

bnx2_do_mem_test(struct bnx2 *bp, u32 start, u32 size)

{

	static u32 test_pattern[] = { 0x00000000, 0xffffffff, 0x55555555,

	static const u32 test_pattern[] = { 0x00000000, 0xffffffff, 0x55555555,

		0xaaaaaaaa , 0xaa55aa55, 0x55aa55aa };

	int i;
@@ -3916,7 +3916,7 @@ bnx2_test_memory(struct bnx2 *bp) 
{

	int ret = 0;

	int i;

	static struct {

	static const struct {

		u32   offset;

		u32   len;

	} mem_tbl[] = {
@@ -5122,7 +5122,7 @@ static struct { 


#define STATS_OFFSET32(offset_name) (offsetof(struct statistics_block, offset_name) / 4)



static unsigned long bnx2_stats_offset_arr[BNX2_NUM_STATS] = {

static const unsigned long bnx2_stats_offset_arr[BNX2_NUM_STATS] = {

    STATS_OFFSET32(stat_IfHCInOctets_hi),

    STATS_OFFSET32(stat_IfHCInBadOctets_hi),

    STATS_OFFSET32(stat_IfHCOutOctets_hi),

drivers/net/bnx2_fw.h

+42 −42
Original line number Diff line number Diff line
@@ -14,20 +14,20 @@ 
 * accompanying it.

 */



static int bnx2_COM_b06FwReleaseMajor = 0x1;

static int bnx2_COM_b06FwReleaseMinor = 0x0;

static int bnx2_COM_b06FwReleaseFix = 0x0;

static u32 bnx2_COM_b06FwStartAddr = 0x080008b4;

static u32 bnx2_COM_b06FwTextAddr = 0x08000000;

static int bnx2_COM_b06FwTextLen = 0x57bc;

static u32 bnx2_COM_b06FwDataAddr = 0x08005840;

static int bnx2_COM_b06FwDataLen = 0x0;

static u32 bnx2_COM_b06FwRodataAddr = 0x080057c0;

static int bnx2_COM_b06FwRodataLen = 0x58;

static u32 bnx2_COM_b06FwBssAddr = 0x08005860;

static int bnx2_COM_b06FwBssLen = 0x88;

static u32 bnx2_COM_b06FwSbssAddr = 0x08005840;

static int bnx2_COM_b06FwSbssLen = 0x1c;

static const int bnx2_COM_b06FwReleaseMajor = 0x1;

static const int bnx2_COM_b06FwReleaseMinor = 0x0;

static const int bnx2_COM_b06FwReleaseFix = 0x0;

static const u32 bnx2_COM_b06FwStartAddr = 0x080008b4;

static const u32 bnx2_COM_b06FwTextAddr = 0x08000000;

static const int bnx2_COM_b06FwTextLen = 0x57bc;

static const u32 bnx2_COM_b06FwDataAddr = 0x08005840;

static const int bnx2_COM_b06FwDataLen = 0x0;

static const u32 bnx2_COM_b06FwRodataAddr = 0x080057c0;

static const int bnx2_COM_b06FwRodataLen = 0x58;

static const u32 bnx2_COM_b06FwBssAddr = 0x08005860;

static const int bnx2_COM_b06FwBssLen = 0x88;

static const u32 bnx2_COM_b06FwSbssAddr = 0x08005840;

static const int bnx2_COM_b06FwSbssLen = 0x1c;

static u32 bnx2_COM_b06FwText[(0x57bc/4) + 1] = {

	0x0a00022d, 0x00000000, 0x00000000, 0x0000000d, 0x636f6d20, 0x322e352e,

	0x38000000, 0x02050802, 0x00000000, 0x00000003, 0x00000014, 0x00000032,
@@ -2325,20 +2325,20 @@ static u32 bnx2_rv2p_proc2[] = { 
	0x0000000c, 0x29520000, 0x00000018, 0x80000002, 0x0000000c, 0x29800000,

	0x00000018, 0x00570000 };



static int bnx2_TPAT_b06FwReleaseMajor = 0x1;

static int bnx2_TPAT_b06FwReleaseMinor = 0x0;

static int bnx2_TPAT_b06FwReleaseFix = 0x0;

static u32 bnx2_TPAT_b06FwStartAddr = 0x08000860;

static u32 bnx2_TPAT_b06FwTextAddr = 0x08000800;

static int bnx2_TPAT_b06FwTextLen = 0x122c;

static u32 bnx2_TPAT_b06FwDataAddr = 0x08001a60;

static int bnx2_TPAT_b06FwDataLen = 0x0;

static u32 bnx2_TPAT_b06FwRodataAddr = 0x00000000;

static int bnx2_TPAT_b06FwRodataLen = 0x0;

static u32 bnx2_TPAT_b06FwBssAddr = 0x08001aa0;

static int bnx2_TPAT_b06FwBssLen = 0x250;

static u32 bnx2_TPAT_b06FwSbssAddr = 0x08001a60;

static int bnx2_TPAT_b06FwSbssLen = 0x34;

static const int bnx2_TPAT_b06FwReleaseMajor = 0x1;

static const int bnx2_TPAT_b06FwReleaseMinor = 0x0;

static const int bnx2_TPAT_b06FwReleaseFix = 0x0;

static const u32 bnx2_TPAT_b06FwStartAddr = 0x08000860;

static const u32 bnx2_TPAT_b06FwTextAddr = 0x08000800;

static const int bnx2_TPAT_b06FwTextLen = 0x122c;

static const u32 bnx2_TPAT_b06FwDataAddr = 0x08001a60;

static const int bnx2_TPAT_b06FwDataLen = 0x0;

static const u32 bnx2_TPAT_b06FwRodataAddr = 0x00000000;

static const int bnx2_TPAT_b06FwRodataLen = 0x0;

static const u32 bnx2_TPAT_b06FwBssAddr = 0x08001aa0;

static const int bnx2_TPAT_b06FwBssLen = 0x250;

static const u32 bnx2_TPAT_b06FwSbssAddr = 0x08001a60;

static const int bnx2_TPAT_b06FwSbssLen = 0x34;

static u32 bnx2_TPAT_b06FwText[(0x122c/4) + 1] = {

	0x0a000218, 0x00000000, 0x00000000, 0x0000000d, 0x74706174, 0x20322e35,

	0x2e313100, 0x02050b01, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -2540,20 +2540,20 @@ static u32 bnx2_TPAT_b06FwRodata[(0x0/4) + 1] = { 0x0 }; 
static u32 bnx2_TPAT_b06FwBss[(0x250/4) + 1] = { 0x0 };

static u32 bnx2_TPAT_b06FwSbss[(0x34/4) + 1] = { 0x0 };



static int bnx2_TXP_b06FwReleaseMajor = 0x1;

static int bnx2_TXP_b06FwReleaseMinor = 0x0;

static int bnx2_TXP_b06FwReleaseFix = 0x0;

static u32 bnx2_TXP_b06FwStartAddr = 0x080034b0;

static u32 bnx2_TXP_b06FwTextAddr = 0x08000000;

static int bnx2_TXP_b06FwTextLen = 0x5748;

static u32 bnx2_TXP_b06FwDataAddr = 0x08005760;

static int bnx2_TXP_b06FwDataLen = 0x0;

static u32 bnx2_TXP_b06FwRodataAddr = 0x00000000;

static int bnx2_TXP_b06FwRodataLen = 0x0;

static u32 bnx2_TXP_b06FwBssAddr = 0x080057a0;

static int bnx2_TXP_b06FwBssLen = 0x1c4;

static u32 bnx2_TXP_b06FwSbssAddr = 0x08005760;

static int bnx2_TXP_b06FwSbssLen = 0x38;

static const int bnx2_TXP_b06FwReleaseMajor = 0x1;

static const int bnx2_TXP_b06FwReleaseMinor = 0x0;

static const int bnx2_TXP_b06FwReleaseFix = 0x0;

static const u32 bnx2_TXP_b06FwStartAddr = 0x080034b0;

static const u32 bnx2_TXP_b06FwTextAddr = 0x08000000;

static const int bnx2_TXP_b06FwTextLen = 0x5748;

static const u32 bnx2_TXP_b06FwDataAddr = 0x08005760;

static const int bnx2_TXP_b06FwDataLen = 0x0;

static const u32 bnx2_TXP_b06FwRodataAddr = 0x00000000;

static const int bnx2_TXP_b06FwRodataLen = 0x0;

static const u32 bnx2_TXP_b06FwBssAddr = 0x080057a0;

static const int bnx2_TXP_b06FwBssLen = 0x1c4;

static const u32 bnx2_TXP_b06FwSbssAddr = 0x08005760;

static const int bnx2_TXP_b06FwSbssLen = 0x38;

static u32 bnx2_TXP_b06FwText[(0x5748/4) + 1] = {

	0x0a000d2c, 0x00000000, 0x00000000, 0x0000000d, 0x74787020, 0x322e352e,

	0x38000000, 0x02050800, 0x0000000a, 0x000003e8, 0x0000ea60, 0x00000000,