Commit 194a90fd authored by Christopher Goldfarb's avatar Christopher Goldfarb Committed by Jeff Garzik

e1000 net drvr update 6/13:

Replace LIST_LEN macro use with the standard ARRAY_SIZE.
parent 463d1c82
...@@ -319,8 +319,6 @@ e1000_validate_option(int *value, struct e1000_option *opt) ...@@ -319,8 +319,6 @@ e1000_validate_option(int *value, struct e1000_option *opt)
return -1; return -1;
} }
#define LIST_LEN(l) (sizeof(l) / sizeof(l[0]))
static void e1000_check_fiber_options(struct e1000_adapter *adapter); static void e1000_check_fiber_options(struct e1000_adapter *adapter);
static void e1000_check_copper_options(struct e1000_adapter *adapter); static void e1000_check_copper_options(struct e1000_adapter *adapter);
...@@ -403,7 +401,7 @@ e1000_check_options(struct e1000_adapter *adapter) ...@@ -403,7 +401,7 @@ e1000_check_options(struct e1000_adapter *adapter)
name: "Flow Control", name: "Flow Control",
err: "reading default settings from EEPROM", err: "reading default settings from EEPROM",
def: e1000_fc_default, def: e1000_fc_default,
arg: { l: { nr: LIST_LEN(fc_list), p: fc_list }} arg: { l: { nr: ARRAY_SIZE(fc_list), p: fc_list }}
}; };
int fc = FlowControl[bd]; int fc = FlowControl[bd];
...@@ -489,7 +487,7 @@ e1000_check_copper_options(struct e1000_adapter *adapter) ...@@ -489,7 +487,7 @@ e1000_check_copper_options(struct e1000_adapter *adapter)
name: "Speed", name: "Speed",
err: "parameter ignored", err: "parameter ignored",
def: 0, def: 0,
arg: { l: { nr: LIST_LEN(speed_list), p: speed_list }} arg: { l: { nr: ARRAY_SIZE(speed_list), p: speed_list }}
}; };
speed = Speed[bd]; speed = Speed[bd];
...@@ -504,7 +502,7 @@ e1000_check_copper_options(struct e1000_adapter *adapter) ...@@ -504,7 +502,7 @@ e1000_check_copper_options(struct e1000_adapter *adapter)
name: "Duplex", name: "Duplex",
err: "parameter ignored", err: "parameter ignored",
def: 0, def: 0,
arg: { l: { nr: LIST_LEN(dplx_list), p: dplx_list }} arg: { l: { nr: ARRAY_SIZE(dplx_list), p: dplx_list }}
}; };
dplx = Duplex[bd]; dplx = Duplex[bd];
...@@ -556,7 +554,7 @@ e1000_check_copper_options(struct e1000_adapter *adapter) ...@@ -556,7 +554,7 @@ e1000_check_copper_options(struct e1000_adapter *adapter)
name: "Autoneg", name: "Autoneg",
err: "parameter ignored", err: "parameter ignored",
def: AUTONEG_ADV_DEFAULT, def: AUTONEG_ADV_DEFAULT,
arg: { l: { nr: LIST_LEN(an_list), p: an_list }} arg: { l: { nr: ARRAY_SIZE(an_list), p: an_list }}
}; };
int an = AutoNeg[bd]; int an = AutoNeg[bd];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment