diff options
| author |   Mark Einon <mark.einon@gmail.com> | 2011-10-20 01:18:40 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-23 10:07:10 +0200 |
| commit | 920d74a405a91248c65490b668c556d4d8f8028a (patch) | |
| tree | 802424b82d1dc93f5bc135cc81f33d6f27232291 /drivers/staging/et131x | |
| parent | staging: et131x: Update TODO list - remove 'put driver into single file' (diff) | |
| download | linux-dev-920d74a405a91248c65490b668c556d4d8f8028a.tar.xz linux-dev-920d74a405a91248c65490b668c556d4d8f8028a.zip | |
staging: et131x: Moving two extern inline functions to .c file
Two helper functions for adding 10bit/12bit umbers with wrapping are
defined in the header. Moved them to the driver .c file.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/et131x')
| -rw-r--r-- | drivers/staging/et131x/et131x.c | 11 | ||||
| -rw-r--r-- | drivers/staging/et131x/et131x.h | 10 |
2 files changed, 11 insertions, 10 deletions
diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c index 959610226d78..14f54e42a23b 100644 --- a/drivers/staging/et131x/et131x.c +++ b/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/drivers/staging/et131x/et131x.h b/drivers/staging/et131x/et131x.h index 84b274d90ce2..7eed3c8986f1 100644 --- a/drivers/staging/et131x/et131x.h +++ b/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 |