From c97df3b6fea01a98f5eb15748984b7f4687552b9 Mon Sep 17 00:00:00 2001 From: Mark Einon Date: Thu, 20 Oct 2011 01:18:40 +0100 Subject: [PATCH] --- yaml --- r: 268865 b: refs/heads/master c: 920d74a405a91248c65490b668c556d4d8f8028a h: refs/heads/master i: 268863: 50832266f73db7dc85216fcad144e5cb689f6893 v: v3 --- [refs] | 2 +- trunk/drivers/staging/et131x/et131x.c | 11 +++++++++++ trunk/drivers/staging/et131x/et131x.h | 10 ---------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 49b0461131bd..6261de4ffcda 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82e4b35f4d71199e90ab00a84bdbfae028f9fa62 +refs/heads/master: 920d74a405a91248c65490b668c556d4d8f8028a diff --git a/trunk/drivers/staging/et131x/et131x.c b/trunk/drivers/staging/et131x/et131x.c index 959610226d78..14f54e42a23b 100644 --- a/trunk/drivers/staging/et131x/et131x.c +++ b/trunk/drivers/staging/et131x/et131x.c @@ -2666,6 +2666,17 @@ void et131x_rx_dma_enable(struct et131x_adapter *adapter) } } + +static inline void add_10bit(u32 *v, int n) +{ + *v = INDEX10(*v + n) | (*v & ET_DMA10_WRAP); +} + +static inline void add_12bit(u32 *v, int n) +{ + *v = INDEX12(*v + n) | (*v & ET_DMA12_WRAP); +} + /** * nic_rx_pkts - Checks the hardware for available packets * @adapter: pointer to our adapter diff --git a/trunk/drivers/staging/et131x/et131x.h b/trunk/drivers/staging/et131x/et131x.h index 84b274d90ce2..7eed3c8986f1 100644 --- a/trunk/drivers/staging/et131x/et131x.h +++ b/trunk/drivers/staging/et131x/et131x.h @@ -230,16 +230,6 @@ struct global_regs { /* Location: */ #define INDEX10(x) ((x) & ET_DMA10_MASK) #define INDEX4(x) ((x) & ET_DMA4_MASK) -extern inline void add_10bit(u32 *v, int n) -{ - *v = INDEX10(*v + n) | (*v & ET_DMA10_WRAP); -} - -extern inline void add_12bit(u32 *v, int n) -{ - *v = INDEX12(*v + n) | (*v & ET_DMA12_WRAP); -} - /* * 10bit DMA with wrap * txdma tx queue write address reg in txdma address map at 0x1010