From e5bdefee874c37019b36853383ab1f7f7e91634f Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Fri, 14 Oct 2011 05:31:08 +0000
Subject: [PATCH] --- yaml --- r: 266823 b: refs/heads/master c:
 39874861f79c660b35ee734f2169be39cf3ae14e h: refs/heads/master i:   266821:
 c8f67683f55a8c355fb014cbb11ab39ef612a77a   266819:
 3a0a4178cd8667708551b1c96aa700b154edc235   266815:
 dbac025f34cda9fc503c4d50574a9a491dbeb8cf v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/net/ethernet/ibm/ehea/ehea_hw.h | 25 -------------------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/[refs] b/[refs]
index fc1dfe814eba..6df47ce606ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30e2e90b4de735769c8c9dc2397388fdf305e5ca
+refs/heads/master: 39874861f79c660b35ee734f2169be39cf3ae14e
diff --git a/trunk/drivers/net/ethernet/ibm/ehea/ehea_hw.h b/trunk/drivers/net/ethernet/ibm/ehea/ehea_hw.h
index 567981b4b2cc..1a2fe4dc3eb3 100644
--- a/trunk/drivers/net/ethernet/ibm/ehea/ehea_hw.h
+++ b/trunk/drivers/net/ethernet/ibm/ehea/ehea_hw.h
@@ -210,36 +210,11 @@ static inline void epa_store_acc(struct h_epa epa, u32 offset, u64 value)
 	__raw_writeq(value, (void __iomem *)(epa.addr + offset));
 }
 
-#define epa_store_eq(epa, offset, value)\
-	epa_store(epa, EQTEMM_OFFSET(offset), value)
-#define epa_load_eq(epa, offset)\
-	epa_load(epa, EQTEMM_OFFSET(offset))
-
 #define epa_store_cq(epa, offset, value)\
 	epa_store(epa, CQTEMM_OFFSET(offset), value)
 #define epa_load_cq(epa, offset)\
 	epa_load(epa, CQTEMM_OFFSET(offset))
 
-#define epa_store_qp(epa, offset, value)\
-	epa_store(epa, QPTEMM_OFFSET(offset), value)
-#define epa_load_qp(epa, offset)\
-	epa_load(epa, QPTEMM_OFFSET(offset))
-
-#define epa_store_qped(epa, offset, value)\
-	epa_store(epa, QPEDMM_OFFSET(offset), value)
-#define epa_load_qped(epa, offset)\
-	epa_load(epa, QPEDMM_OFFSET(offset))
-
-#define epa_store_mrmw(epa, offset, value)\
-	epa_store(epa, MRMWMM_OFFSET(offset), value)
-#define epa_load_mrmw(epa, offset)\
-	epa_load(epa, MRMWMM_OFFSET(offset))
-
-#define epa_store_base(epa, offset, value)\
-	epa_store(epa, HCAGR_OFFSET(offset), value)
-#define epa_load_base(epa, offset)\
-	epa_load(epa, HCAGR_OFFSET(offset))
-
 static inline void ehea_update_sqa(struct ehea_qp *qp, u16 nr_wqes)
 {
 	struct h_epa epa = qp->epas.kernel;