diff options
Diffstat (limited to 'drivers/net/atlx')
-rw-r--r-- | drivers/net/atlx/atl1.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c index 240db847e129..5586fc624688 100644 --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/atlx/atl1.c | |||
@@ -502,6 +502,7 @@ static s32 atl1_phy_leave_power_saving(struct atl1_hw *hw) | |||
502 | /* | 502 | /* |
503 | *TODO: do something or get rid of this | 503 | *TODO: do something or get rid of this |
504 | */ | 504 | */ |
505 | #ifdef CONFIG_PM | ||
505 | static s32 atl1_phy_enter_power_saving(struct atl1_hw *hw) | 506 | static s32 atl1_phy_enter_power_saving(struct atl1_hw *hw) |
506 | { | 507 | { |
507 | /* s32 ret_val; | 508 | /* s32 ret_val; |
@@ -515,6 +516,7 @@ static s32 atl1_phy_enter_power_saving(struct atl1_hw *hw) | |||
515 | */ | 516 | */ |
516 | return 0; | 517 | return 0; |
517 | } | 518 | } |
519 | #endif | ||
518 | 520 | ||
519 | /* | 521 | /* |
520 | * Resets the PHY and make all config validate | 522 | * Resets the PHY and make all config validate |
@@ -2342,15 +2344,12 @@ static irqreturn_t atl1_intr(int irq, void *data) | |||
2342 | { | 2344 | { |
2343 | struct atl1_adapter *adapter = netdev_priv(data); | 2345 | struct atl1_adapter *adapter = netdev_priv(data); |
2344 | u32 status; | 2346 | u32 status; |
2345 | u8 update_rx; | ||
2346 | int max_ints = 10; | 2347 | int max_ints = 10; |
2347 | 2348 | ||
2348 | status = adapter->cmb.cmb->int_stats; | 2349 | status = adapter->cmb.cmb->int_stats; |
2349 | if (!status) | 2350 | if (!status) |
2350 | return IRQ_NONE; | 2351 | return IRQ_NONE; |
2351 | 2352 | ||
2352 | update_rx = 0; | ||
2353 | |||
2354 | do { | 2353 | do { |
2355 | /* clear CMB interrupt status at once */ | 2354 | /* clear CMB interrupt status at once */ |
2356 | adapter->cmb.cmb->int_stats = 0; | 2355 | adapter->cmb.cmb->int_stats = 0; |