From 126cd4bc5fa9cdbedb89bbe7e568140c94900ca7 Mon Sep 17 00:00:00 2001 From: Oliver Endriss Date: Tue, 22 Dec 2009 04:37:53 -0300 Subject: [PATCH] V4L/DVB: DVB: Export dvb_ringbuffer_flush() again Add EXPORT_SYMBOL(dvb_ringbuffer_flush) again, replace my_dvb_ringbuffer_flush() in ngene driver. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab --- drivers/media/dvb/dvb-core/dvb_ringbuffer.c | 1 + drivers/media/dvb/ngene/ngene-core.c | 16 ++-------------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/drivers/media/dvb/dvb-core/dvb_ringbuffer.c b/drivers/media/dvb/dvb-core/dvb_ringbuffer.c index 584bbd194dc8..a5712cd7c65f 100644 --- a/drivers/media/dvb/dvb-core/dvb_ringbuffer.c +++ b/drivers/media/dvb/dvb-core/dvb_ringbuffer.c @@ -89,6 +89,7 @@ void dvb_ringbuffer_flush(struct dvb_ringbuffer *rbuf) rbuf->pread = rbuf->pwrite; rbuf->error = 0; } +EXPORT_SYMBOL(dvb_ringbuffer_flush); void dvb_ringbuffer_reset(struct dvb_ringbuffer *rbuf) { diff --git a/drivers/media/dvb/ngene/ngene-core.c b/drivers/media/dvb/ngene/ngene-core.c index 72c06c66a952..7d9feba71e11 100644 --- a/drivers/media/dvb/ngene/ngene-core.c +++ b/drivers/media/dvb/ngene/ngene-core.c @@ -76,18 +76,6 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); #define ngcpyfrom(dst, adr, count) memcpy_fromio((dst), (char *) \ (dev->iomem + (adr)), (count)) -/****************************************************************************/ -/* Functions with missing kernel exports ************************************/ -/****************************************************************************/ - -/* yeah, let's throw out all exports which are not used in kernel ... */ - -void my_dvb_ringbuffer_flush(struct dvb_ringbuffer *rbuf) -{ - rbuf->pread = rbuf->pwrite; - rbuf->error = 0; -} - /****************************************************************************/ /* nGene interrupt handler **************************************************/ /****************************************************************************/ @@ -1518,7 +1506,7 @@ static void set_transfer(struct ngene_channel *chan, int state) /* printk(KERN_INFO DEVICE_NAME ": lock=%08x\n", ngreadl(0x9310)); */ - my_dvb_ringbuffer_flush(&dev->tsout_rbuf); + dvb_ringbuffer_flush(&dev->tsout_rbuf); control = 0x80; if (chan->mode & (NGENE_IO_TSIN | NGENE_IO_TSOUT)) { chan->Capture1Length = 512 * 188; @@ -1549,7 +1537,7 @@ static void set_transfer(struct ngene_channel *chan, int state) if (!state) { spin_lock_irq(&chan->state_lock); chan->pBufferExchange = 0; - my_dvb_ringbuffer_flush(&dev->tsout_rbuf); + dvb_ringbuffer_flush(&dev->tsout_rbuf); spin_unlock_irq(&chan->state_lock); } } -- 2.39.5