Skip to content

Commit

Permalink
staging: et131x: Moving two extern inline functions to .c file
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mark Einon authored and Greg Kroah-Hartman committed Oct 23, 2011
1 parent 82e4b35 commit 920d74a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
11 changes: 11 additions & 0 deletions drivers/staging/et131x/et131x.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions drivers/staging/et131x/et131x.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 920d74a

Please sign in to comment.