diff options
| author | Mandy Lavi <mandy.lavi@freescale.com> | 2013-06-24 12:54:35 (GMT) |
|---|---|---|
| committer | J. German Rivera <Jose.G.Rivera@freescale.com> | 2013-08-12 21:38:38 (GMT) |
| commit | f3d9ad20b340df7c4ed1d7b8ce6a54d4272b3821 (patch) | |
| tree | 46d9d9ba821f9f5f9903c15e8c36a6cc202c645b | |
| parent | c1efd40363ac2bb4737ae9a22d047eda8510bfe8 (diff) | |
| download | linux-fsl-qoriq-f3d9ad20b340df7c4ed1d7b8ce6a54d4272b3821.tar.xz | |
fmd: remove unused macros
Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com>
Change-Id: If2fda57aaf42719d0a3aae2256d513856583913b
Reviewed-on: http://git.am.freescale.net:8181/3427
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
3 files changed, 1 insertions, 33 deletions
diff --git a/drivers/net/ethernet/freescale/fman/inc/Peripherals/fm_pcd_ext.h b/drivers/net/ethernet/freescale/fman/inc/Peripherals/fm_pcd_ext.h index d9bea95..00750ba 100644 --- a/drivers/net/ethernet/freescale/fman/inc/Peripherals/fm_pcd_ext.h +++ b/drivers/net/ethernet/freescale/fman/inc/Peripherals/fm_pcd_ext.h @@ -99,16 +99,6 @@ #define FM_PCD_SW_PRS_SIZE 0x00000800 /**< Total size of SW parser area */ #define FM_PCD_PRS_SW_OFFSET 0x00000040 /**< Size of illegal addresses at the beginning of the SW parser area */ -#if (DPAA_VERSION >= 11) -#define FM_PCD_PRS_SW_PATCHES_SIZE 0x00000240 /**< Number of bytes saved for patches */ -#else -#define FM_PCD_PRS_SW_PATCHES_SIZE 0x00000200 /**< Number of bytes saved for patches */ -#endif /* (DPAA_VERSION >= 11) */ - -#define FM_PCD_PRS_SW_TAIL_SIZE 4 /**< Number of bytes that must be cleared at - the end of the SW parser area */ -#define FM_SW_PRS_MAX_IMAGE_SIZE (FM_PCD_SW_PRS_SIZE-FM_PCD_PRS_SW_OFFSET-FM_PCD_PRS_SW_TAIL_SIZE-FM_PCD_PRS_SW_PATCHES_SIZE) - /**< Maximum size of SW parser code */ #define FM_PCD_MAX_MANIP_INSRT_TEMPLATE_SIZE 128 /**< Maximum size of insertion template for insert manipulation */ diff --git a/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_ioctls_fm.c b/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_ioctls_fm.c index f87529d..d896b27 100644 --- a/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_ioctls_fm.c +++ b/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_ioctls_fm.c @@ -126,18 +126,6 @@ #error Error: please synchronize IOC_ defines! #endif -#if CMP_IOC_DEFINE(FM_PCD_PRS_SW_PATCHES_SIZE) -#error Error: please synchronize IOC_ defines! -#endif - -#if CMP_IOC_DEFINE(FM_PCD_PRS_SW_TAIL_SIZE) -#error Error: please synchronize IOC_ defines! -#endif - -#if CMP_IOC_DEFINE(FM_SW_PRS_MAX_IMAGE_SIZE) -#error Error: please synchronize IOC_ defines! -#endif - #if CMP_IOC_DEFINE(FM_PCD_MAX_MANIP_INSRT_TEMPLATE_SIZE) #error Error: please synchronize IOC_ defines! #endif diff --git a/include/uapi/linux/fmd/Peripherals/fm_pcd_ioctls.h b/include/uapi/linux/fmd/Peripherals/fm_pcd_ioctls.h index 8c07f18..542f935 100644 --- a/include/uapi/linux/fmd/Peripherals/fm_pcd_ioctls.h +++ b/include/uapi/linux/fmd/Peripherals/fm_pcd_ioctls.h @@ -78,7 +78,7 @@ #define IOC_FM_PCD_PRS_NUM_OF_HDRS 16 /**< Number of headers supported by HW parser */ #define IOC_FM_PCD_MAX_NUM_OF_DISTINCTION_UNITS (32 - IOC_FM_PCD_MAX_NUM_OF_PRIVATE_HDRS) - /**< Number of distinction units is limited by + /**< Number of distinction units is limited by register size (32 bits) minus reserved bits for private headers. */ #define IOC_FM_PCD_MAX_NUM_OF_INTERCHANGEABLE_HDRS 4 /**< Maximum number of interchangeable headers @@ -96,16 +96,6 @@ #define IOC_FM_PCD_SW_PRS_SIZE 0x00000800 /**< Total size of SW parser area */ #define IOC_FM_PCD_PRS_SW_OFFSET 0x00000040 /**< Size of illegal addresses at the beginning of the SW parser area */ -#if DPAA_VERSION >= 11 -#define IOC_FM_PCD_PRS_SW_PATCHES_SIZE 0x00000240 /**< Number of bytes saved for patches */ -#else -#define IOC_FM_PCD_PRS_SW_PATCHES_SIZE 0x00000200 /**< Number of bytes saved for patches */ -#endif - -#define IOC_FM_PCD_PRS_SW_TAIL_SIZE 4 /**< Number of bytes that must be cleared at - the end of the SW parser area */ -#define IOC_FM_SW_PRS_MAX_IMAGE_SIZE (IOC_FM_PCD_SW_PRS_SIZE-IOC_FM_PCD_PRS_SW_OFFSET-IOC_FM_PCD_PRS_SW_TAIL_SIZE-IOC_FM_PCD_PRS_SW_PATCHES_SIZE) - /**< Maximum size of SW parser code */ #define IOC_FM_PCD_MAX_MANIP_INSRT_TEMPLATE_SIZE 128 /**< Maximum size of insertion template for insert manipulation */ |