Commit 96f31530 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: mite: don't expose mite_dma_reset()

This function is only called by the mite driver. Remove the inline
function from the header and make it static in the driver.

Use the function in mite_prep_dma() instead of duplicating the code.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eecbadef
...@@ -51,6 +51,12 @@ ...@@ -51,6 +51,12 @@
#include "mite.h" #include "mite.h"
static void mite_dma_reset(struct mite_channel *mite_chan)
{
writel(CHOR_DMARESET | CHOR_FRESET,
mite_chan->mite->mite_io_addr + MITE_CHOR(mite_chan->channel));
}
struct mite_struct *mite_alloc(struct pci_dev *pcidev) struct mite_struct *mite_alloc(struct pci_dev *pcidev)
{ {
struct mite_struct *mite; struct mite_struct *mite;
...@@ -387,12 +393,10 @@ EXPORT_SYMBOL_GPL(mite_init_ring_descriptors); ...@@ -387,12 +393,10 @@ EXPORT_SYMBOL_GPL(mite_init_ring_descriptors);
void mite_prep_dma(struct mite_channel *mite_chan, void mite_prep_dma(struct mite_channel *mite_chan,
unsigned int num_device_bits, unsigned int num_memory_bits) unsigned int num_device_bits, unsigned int num_memory_bits)
{ {
unsigned int chor, chcr, mcr, dcr, lkcr; unsigned int chcr, mcr, dcr, lkcr;
struct mite_struct *mite = mite_chan->mite; struct mite_struct *mite = mite_chan->mite;
/* reset DMA and FIFO */ mite_dma_reset(mite_chan);
chor = CHOR_DMARESET | CHOR_FRESET;
writel(chor, mite->mite_io_addr + MITE_CHOR(mite_chan->channel));
/* short link chaining mode */ /* short link chaining mode */
chcr = CHCR_SET_DMA_IE | CHCR_LINKSHORT | CHCR_SET_DONE_IE | chcr = CHCR_SET_DMA_IE | CHCR_LINKSHORT | CHCR_SET_DONE_IE |
......
...@@ -337,10 +337,4 @@ enum CHSR_bits { ...@@ -337,10 +337,4 @@ enum CHSR_bits {
CHSR_DOERR = (3 << 0), CHSR_DOERR = (3 << 0),
}; };
static inline void mite_dma_reset(struct mite_channel *mite_chan)
{
writel(CHOR_DMARESET | CHOR_FRESET,
mite_chan->mite->mite_io_addr + MITE_CHOR(mite_chan->channel));
};
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment