| Message ID | 1382331307-4962-1-git-send-email-michael.opdenacker@free-electrons.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
On 10/21/2013 06:55 AM, Michael Opdenacker wrote: > This removes duplicate definitions of S_BUSY, V_BUSY() and F_BUSY > in drivers/net/ethernet/chelsio/cxgb3/regs.h Forget this version. There are other duplicates in this file. I'll submit a new version of this patch. > > Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com> > --- > drivers/net/ethernet/chelsio/cxgb3/regs.h | 12 ------------ > 1 file changed, 12 deletions(-) > > diff --git a/drivers/net/ethernet/chelsio/cxgb3/regs.h b/drivers/net/ethernet/chelsio/cxgb3/regs.h > index 6990f6c..b8367ec 100644 > --- a/drivers/net/ethernet/chelsio/cxgb3/regs.h > +++ b/drivers/net/ethernet/chelsio/cxgb3/regs.h > @@ -685,10 +685,6 @@ > #define V_BUSY(x) ((x) << S_BUSY) > #define F_BUSY V_BUSY(1U) > > -#define S_BUSY 31 > -#define V_BUSY(x) ((x) << S_BUSY) > -#define F_BUSY V_BUSY(1U) > - > #define A_MC7_EXT_MODE1 0x108 > > #define A_MC7_EXT_MODE2 0x10c > @@ -749,14 +745,6 @@ > > #define A_MC7_CAL 0x128 > > -#define S_BUSY 31 > -#define V_BUSY(x) ((x) << S_BUSY) > -#define F_BUSY V_BUSY(1U) > - > -#define S_BUSY 31 > -#define V_BUSY(x) ((x) << S_BUSY) > -#define F_BUSY V_BUSY(1U) > - > #define S_CAL_FAULT 30 > #define V_CAL_FAULT(x) ((x) << S_CAL_FAULT) > #define F_CAL_FAULT V_CAL_FAULT(1U)
diff --git a/drivers/net/ethernet/chelsio/cxgb3/regs.h b/drivers/net/ethernet/chelsio/cxgb3/regs.h index 6990f6c..b8367ec 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/regs.h +++ b/drivers/net/ethernet/chelsio/cxgb3/regs.h @@ -685,10 +685,6 @@ #define V_BUSY(x) ((x) << S_BUSY) #define F_BUSY V_BUSY(1U) -#define S_BUSY 31 -#define V_BUSY(x) ((x) << S_BUSY) -#define F_BUSY V_BUSY(1U) - #define A_MC7_EXT_MODE1 0x108 #define A_MC7_EXT_MODE2 0x10c @@ -749,14 +745,6 @@ #define A_MC7_CAL 0x128 -#define S_BUSY 31 -#define V_BUSY(x) ((x) << S_BUSY) -#define F_BUSY V_BUSY(1U) - -#define S_BUSY 31 -#define V_BUSY(x) ((x) << S_BUSY) -#define F_BUSY V_BUSY(1U) - #define S_CAL_FAULT 30 #define V_CAL_FAULT(x) ((x) << S_CAL_FAULT) #define F_CAL_FAULT V_CAL_FAULT(1U)
This removes duplicate definitions of S_BUSY, V_BUSY() and F_BUSY in drivers/net/ethernet/chelsio/cxgb3/regs.h Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com> --- drivers/net/ethernet/chelsio/cxgb3/regs.h | 12 ------------ 1 file changed, 12 deletions(-)