Bladeren bron

[e1000] Remove deprecated IRQ_FORCE action from e1000_irq()

The gPXE driver API does not have a "force interrupt" function.
Remove legacy code.

Signed-off-by: Marty Connor <mdc@etherboot.org>
tags/v1.0.0-rc1
Thomas Miletich 14 jaren geleden
bovenliggende
commit
cd04338f7c
1 gewijzigde bestanden met toevoegingen van 4 en 23 verwijderingen
  1. 4
    23
      src/drivers/net/e1000/e1000.c

+ 4
- 23
src/drivers/net/e1000/e1000.c Bestand weergeven

109
 	E1000_WRITE_FLUSH ( &adapter->hw );
109
 	E1000_WRITE_FLUSH ( &adapter->hw );
110
 }
110
 }
111
 
111
 
112
-/**
113
- * e1000_irq_force - trigger interrupt
114
- *
115
- * @v adapter	e1000 private structure
116
- **/
117
-static void
118
-e1000_irq_force ( struct e1000_adapter *adapter )
119
-{
120
-	E1000_WRITE_REG ( &adapter->hw, ICS, E1000_ICS_RXDMT0 );
121
-	E1000_WRITE_FLUSH ( &adapter->hw );
122
-}
123
-
124
 /**
112
 /**
125
  * e1000_sw_init - Initialize general software structures (struct e1000_adapter)
113
  * e1000_sw_init - Initialize general software structures (struct e1000_adapter)
126
  *
114
  *
813
 	struct e1000_adapter *adapter = netdev_priv(netdev);
801
 	struct e1000_adapter *adapter = netdev_priv(netdev);
814
 
802
 
815
 	DBG ( "e1000_irq\n" );
803
 	DBG ( "e1000_irq\n" );
816
-	
817
-	switch ( enable ) {
818
-	case 0 :
819
-		e1000_irq_disable ( adapter );
820
-		break;
821
-	case 1 :
804
+
805
+	if ( enable )
822
 		e1000_irq_enable ( adapter );
806
 		e1000_irq_enable ( adapter );
823
-		break;
824
-	case 2 :
825
-		e1000_irq_force ( adapter );
826
-		break;
827
-	}
807
+	else
808
+		e1000_irq_disable ( adapter );
828
 }
809
 }
829
 
810
 
830
 static struct net_device_operations e1000_operations;
811
 static struct net_device_operations e1000_operations;

Laden…
Annuleren
Opslaan