Commit 64798845 authored by Joe Perches's avatar Joe Perches Committed by Jeff Garzik

e1000: neaten function declarations

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent cdc18a67
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -213,10 +213,9 @@ struct e1000_option { ...@@ -213,10 +213,9 @@ struct e1000_option {
} arg; } arg;
}; };
static int __devinit static int __devinit e1000_validate_option(unsigned int *value,
e1000_validate_option(unsigned int *value, const struct e1000_option *opt,
const struct e1000_option *opt, struct e1000_adapter *adapter)
struct e1000_adapter *adapter)
{ {
if (*value == OPTION_UNSET) { if (*value == OPTION_UNSET) {
*value = opt->def; *value = opt->def;
...@@ -278,8 +277,7 @@ static void e1000_check_copper_options(struct e1000_adapter *adapter); ...@@ -278,8 +277,7 @@ static void e1000_check_copper_options(struct e1000_adapter *adapter);
* in a variable in the adapter structure. * in a variable in the adapter structure.
**/ **/
void __devinit void __devinit e1000_check_options(struct e1000_adapter *adapter)
e1000_check_options(struct e1000_adapter *adapter)
{ {
int bd = adapter->bd_number; int bd = adapter->bd_number;
if (bd >= E1000_MAX_NIC) { if (bd >= E1000_MAX_NIC) {
...@@ -551,8 +549,7 @@ e1000_check_options(struct e1000_adapter *adapter) ...@@ -551,8 +549,7 @@ e1000_check_options(struct e1000_adapter *adapter)
* Handles speed and duplex options on fiber adapters * Handles speed and duplex options on fiber adapters
**/ **/
static void __devinit static void __devinit e1000_check_fiber_options(struct e1000_adapter *adapter)
e1000_check_fiber_options(struct e1000_adapter *adapter)
{ {
int bd = adapter->bd_number; int bd = adapter->bd_number;
if (num_Speed > bd) { if (num_Speed > bd) {
...@@ -579,8 +576,7 @@ e1000_check_fiber_options(struct e1000_adapter *adapter) ...@@ -579,8 +576,7 @@ e1000_check_fiber_options(struct e1000_adapter *adapter)
* Handles speed and duplex options on copper adapters * Handles speed and duplex options on copper adapters
**/ **/
static void __devinit static void __devinit e1000_check_copper_options(struct e1000_adapter *adapter)
e1000_check_copper_options(struct e1000_adapter *adapter)
{ {
unsigned int speed, dplx, an; unsigned int speed, dplx, an;
int bd = adapter->bd_number; int bd = adapter->bd_number;
......
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