Staging: et131x: kill NMI hacks

The NMI code is in the shipped driver for "validation". We won't be doing
chip validation and we have proper core nmi handling so this can go.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/et131x/et131x_adapter.h b/drivers/staging/et131x/et131x_adapter.h
index 83ddcd503ebd110fa51457c4409ae0f4486e79d2..bd53cb9dacac340e7c2ba59342cb94947e2fec9c 100644 (file)
--- a/drivers/staging/et131x/et131x_adapter.h
+++ b/drivers/staging/et131x/et131x_adapter.h
@@ -235,7 +235,6 @@ struct et131x_adapter {
        u32 RegistryJumboPacket;        /* Max supported ethernet packet size */
 
        /* Validation helpers */
-       u8 RegistryNMIDisable;
        u8 RegistryPhyLoopbk;   /* Enable Phy loopback */
 
        /* Derived from the registry: */

diff --git a/drivers/staging/et131x/et131x_defs.h b/drivers/staging/et131x/et131x_defs.h
index f98dca5fd26b2ff6c206ff3b0f4455a32fe55815..d81fc77a501fc1840253174f20316871ad71cf3d 100644 (file)
--- a/drivers/staging/et131x/et131x_defs.h
+++ b/drivers/staging/et131x/et131x_defs.h
@@ -102,7 +102,6 @@
 
 /* Some offsets in PCI config space that are actually used. */
 #define ET1310_PCI_MAX_PYLD            0x4C
-#define ET1310_NMI_DISABLE             0x61
 #define ET1310_PCI_MAC_ADDRESS         0xA4
 #define ET1310_PCI_EEPROM_STATUS       0xB2
 #define ET1310_PCI_ACK_NACK            0xC0

diff --git a/drivers/staging/et131x/et131x_initpci.c b/drivers/staging/et131x/et131x_initpci.c
index 7b1e912f3ab2bab2410f529eafdcf914a7a4a184..db1ce58ba6a74a407009d9265a78969ec79e92a1 100644 (file)
--- a/drivers/staging/et131x/et131x_initpci.c
+++ b/drivers/staging/et131x/et131x_initpci.c
@@ -106,17 +106,6 @@
 #define PARM_SPEED_DUPLEX_MIN   0
 #define PARM_SPEED_DUPLEX_MAX   5
 
-/* Module parameter for disabling NMI
- * et131x_nmi_disable :
- * Disable NMI (0-2) [0]
- *  0 :
- *  1 :
- *  2 :
- */
-static u32 et131x_nmi_disable; /* 0-2 */
-module_param(et131x_nmi_disable, uint, 0);
-MODULE_PARM_DESC(et131x_nmi_disable, "Disable NMI (0-2) [0]");
-
 /* Module parameter for manual speed setting
  * Set Link speed and dublex manually (0-5)  [0]
  *  1 : 10Mb   Half-Duplex
@@ -187,21 +176,6 @@ static int et131x_pci_init(struct et131x_adapter *adapter,
        u8 max_payload;
        u8 read_size_reg;
 
-       /* Allow disabling of Non-Maskable Interrupts in I/O space, to
-        * support validation.
-        */
-       if (adapter->RegistryNMIDisable) {
-               uint8_t RegisterVal;
-
-               RegisterVal = inb(ET1310_NMI_DISABLE);
-               RegisterVal &= 0xf3;
-
-               if (adapter->RegistryNMIDisable == 2)
-                       RegisterVal |= 0xc;
-
-               outb(ET1310_NMI_DISABLE, RegisterVal);
-       }
-
        if (et131x_init_eeprom(adapter) < 0)
                return -EIO;
 
@@ -613,8 +587,6 @@ static struct et131x_adapter *et131x_adapter_init(struct net_device *netdev,
        etdev->SpeedDuplex = et131x_speed_set;
        etdev->RegistryJumboPacket = 1514;      /* 1514-9216 */
 
-       etdev->RegistryNMIDisable = et131x_nmi_disable;
-
        /* Set the MAC address to a default */
        memcpy(etdev->CurrentAddress, default_mac, ETH_ALEN);