From patchwork Tue Aug 25 15:00:23 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Cox X-Patchwork-Id: 32064 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 8969CB7BC9 for ; Wed, 26 Aug 2009 01:06:38 +1000 (EST) Received: by ozlabs.org (Postfix) id 51E2CDDDD3; Wed, 26 Aug 2009 01:06:38 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id DA9C6DDDB6 for ; Wed, 26 Aug 2009 01:06:37 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755394AbZHYPFq (ORCPT ); Tue, 25 Aug 2009 11:05:46 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755384AbZHYPFq (ORCPT ); Tue, 25 Aug 2009 11:05:46 -0400 Received: from earthlight.etchedpixels.co.uk ([81.2.110.250]:47811 "EHLO bob.linux.org.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755383AbZHYPFp (ORCPT ); Tue, 25 Aug 2009 11:05:45 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by bob.linux.org.uk (8.14.3/8.14.3) with ESMTP id n7PF0NkM016539; Tue, 25 Aug 2009 16:00:23 +0100 From: Alan Cox Subject: [PATCH 18/26] et131x: remove unused PCI identifiers To: greg@kroah.com, netdev@vger.kernel.org Date: Tue, 25 Aug 2009 16:00:23 +0100 Message-ID: <20090825150021.16176.64405.stgit@localhost.localdomain> In-Reply-To: <20090825145619.16176.68780.stgit@localhost.localdomain> References: <20090825145619.16176.68780.stgit@localhost.localdomain> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Alan Cox --- drivers/staging/et131x/et1310_phy.h | 25 ------------------------- drivers/staging/et131x/et1310_pm.h | 30 ------------------------------ drivers/staging/et131x/et131x_defs.h | 8 -------- 3 files changed, 0 insertions(+), 63 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/staging/et131x/et1310_phy.h b/drivers/staging/et131x/et1310_phy.h index aec0a7b..080656c 100644 --- a/drivers/staging/et131x/et1310_phy.h +++ b/drivers/staging/et131x/et1310_phy.h @@ -63,9 +63,6 @@ #define TRUEPHY_SUCCESS 0 #define TRUEPHY_FAILURE 1 -typedef void *TRUEPHY_HANDLE; -typedef void *TRUEPHY_PLATFORM_HANDLE; -typedef void *TRUEPHY_OSAL_HANDLE; /* MI Register Addresses */ #define MI_CONTROL_REG 0 @@ -742,28 +739,6 @@ typedef union _MI_LCR2_t { /* MI Register 29 - 31: Reserved Reg(0x1D - 0x1E) */ -/* TruePHY headers */ -typedef struct _TRUEPHY_ACCESS_MI_REGS_ { - TRUEPHY_HANDLE hTruePhy; - int32_t nPhyId; - u8 bReadWrite; - u8 *pbyRegs; - u8 *pwData; - int32_t nRegCount; -} TRUEPHY_ACCESS_MI_REGS, *PTRUEPHY_ACCESS_MI_REGS; - -/* TruePHY headers */ -typedef struct _TAG_TPAL_ACCESS_MI_REGS_ { - u32 nPhyId; - u8 bReadWrite; - u32 nRegCount; - u16 Data[4096]; - u8 Regs[4096]; -} TPAL_ACCESS_MI_REGS, *PTPAL_ACCESS_MI_REGS; - - -typedef TRUEPHY_HANDLE TPAL_HANDLE; - /* Forward declaration of the private adapter structure */ struct et131x_adapter; diff --git a/drivers/staging/et131x/et1310_pm.h b/drivers/staging/et131x/et1310_pm.h index 8e06039..295f3ab 100644 --- a/drivers/staging/et131x/et1310_pm.h +++ b/drivers/staging/et131x/et1310_pm.h @@ -61,54 +61,24 @@ #include "et1310_address_map.h" -#define MAX_WOL_PACKET_SIZE 0x80 -#define MAX_WOL_MASK_SIZE (MAX_WOL_PACKET_SIZE / 8) -#define NUM_WOL_PATTERNS 0x5 -#define CRC16_POLY 0x1021 - typedef struct _MP_POWER_MGMT { /* variable putting the phy into coma mode when boot up with no cable * plugged in after 5 seconds */ u8 TransPhyComaModeOnBoot; - /* Array holding the five CRC values that the device is currently - * using for WOL. This will be queried when a pattern is to be - * removed. - */ - u32 localWolAndCrc0; - u16 WOLPatternList[NUM_WOL_PATTERNS]; - u8 WOLMaskList[NUM_WOL_PATTERNS][MAX_WOL_MASK_SIZE]; - u32 WOLMaskSize[NUM_WOL_PATTERNS]; - - /* IP address */ - union { - u32 u32; - u8 u8[4]; - } IPAddress; - - /* Current Power state of the adapter. */ - bool WOLState; - bool WOLEnabled; - bool Failed10Half; - bool bFailedStateTransition; - /* Next two used to save power information at power down. This * information will be used during power up to set up parts of Power * Management in JAGCore */ - u32 tx_en; - u32 rx_en; u16 PowerDownSpeed; u8 PowerDownDuplex; } MP_POWER_MGMT, *PMP_POWER_MGMT; /* Forward declaration of the private adapter structure - * ( IS THERE A WAY TO DO THIS WITH A TYPEDEF??? ) */ struct et131x_adapter; -u16 CalculateCCITCRC16(u8 *Pattern, u8 *Mask, u32 MaskSize); void EnablePhyComa(struct et131x_adapter *adapter); void DisablePhyComa(struct et131x_adapter *adapter); diff --git a/drivers/staging/et131x/et131x_defs.h b/drivers/staging/et131x/et131x_defs.h index 5665c6a..f98dca5 100644 --- a/drivers/staging/et131x/et131x_defs.h +++ b/drivers/staging/et131x/et131x_defs.h @@ -61,7 +61,6 @@ /* Packet and header sizes */ #define NIC_MIN_PACKET_SIZE 60 -#define NIC_HEADER_SIZE ETH_HLEN /* 14 */ /* Multicast list size */ #define NIC_MAX_MCAST_LIST 128 @@ -102,20 +101,13 @@ #define fMP_ADAPTER_NOT_READY_MASK 0x3ff00000 /* Some offsets in PCI config space that are actually used. */ -#define ET1310_PCI_PM_CAPABILITY 0x40 -#define ET1310_PCI_PM_CSR 0x44 #define ET1310_PCI_MAX_PYLD 0x4C -#define ET1310_PCI_DEV_CTRL 0x50 -#define ET1310_PCI_DEV_STAT 0x52 #define ET1310_NMI_DISABLE 0x61 #define ET1310_PCI_MAC_ADDRESS 0xA4 #define ET1310_PCI_EEPROM_STATUS 0xB2 -#define ET1310_PCI_PHY_INDEX_REG 0xB4 #define ET1310_PCI_ACK_NACK 0xC0 #define ET1310_PCI_REPLAY 0xC2 #define ET1310_PCI_L0L1LATENCY 0xCF -#define ET1310_PCI_SEL_PHY_CTRL 0xE4 -#define ET1310_PCI_ADVANCED_ERR 0x100 /* PCI Vendor/Product IDs */ #define ET131X_PCI_VENDOR_ID 0x11C1 /* Agere Systems */