aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorOliver Endriss <o.endriss@gmx.de>2009-12-22 02:37:53 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-02-26 13:10:54 -0500
commit126cd4bc5fa9cdbedb89bbe7e568140c94900ca7 (patch)
treee35b8f2b8b6d55fc41c0e76ee6e7a024b09161d6 /drivers
parent948a119547cf5043b40c2151d6f6913fbcf65e38 (diff)
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 <o.endriss@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/dvb/dvb-core/dvb_ringbuffer.c1
-rw-r--r--drivers/media/dvb/ngene/ngene-core.c16
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)
89 rbuf->pread = rbuf->pwrite; 89 rbuf->pread = rbuf->pwrite;
90 rbuf->error = 0; 90 rbuf->error = 0;
91} 91}
92EXPORT_SYMBOL(dvb_ringbuffer_flush);
92 93
93void dvb_ringbuffer_reset(struct dvb_ringbuffer *rbuf) 94void dvb_ringbuffer_reset(struct dvb_ringbuffer *rbuf)
94{ 95{
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
@@ -77,18 +77,6 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
77 (dev->iomem + (adr)), (count)) 77 (dev->iomem + (adr)), (count))
78 78
79/****************************************************************************/ 79/****************************************************************************/
80/* Functions with missing kernel exports ************************************/
81/****************************************************************************/
82
83/* yeah, let's throw out all exports which are not used in kernel ... */
84
85void my_dvb_ringbuffer_flush(struct dvb_ringbuffer *rbuf)
86{
87 rbuf->pread = rbuf->pwrite;
88 rbuf->error = 0;
89}
90
91/****************************************************************************/
92/* nGene interrupt handler **************************************************/ 80/* nGene interrupt handler **************************************************/
93/****************************************************************************/ 81/****************************************************************************/
94 82
@@ -1518,7 +1506,7 @@ static void set_transfer(struct ngene_channel *chan, int state)
1518 1506
1519 /* printk(KERN_INFO DEVICE_NAME ": lock=%08x\n", 1507 /* printk(KERN_INFO DEVICE_NAME ": lock=%08x\n",
1520 ngreadl(0x9310)); */ 1508 ngreadl(0x9310)); */
1521 my_dvb_ringbuffer_flush(&dev->tsout_rbuf); 1509 dvb_ringbuffer_flush(&dev->tsout_rbuf);
1522 control = 0x80; 1510 control = 0x80;
1523 if (chan->mode & (NGENE_IO_TSIN | NGENE_IO_TSOUT)) { 1511 if (chan->mode & (NGENE_IO_TSIN | NGENE_IO_TSOUT)) {
1524 chan->Capture1Length = 512 * 188; 1512 chan->Capture1Length = 512 * 188;
@@ -1549,7 +1537,7 @@ static void set_transfer(struct ngene_channel *chan, int state)
1549 if (!state) { 1537 if (!state) {
1550 spin_lock_irq(&chan->state_lock); 1538 spin_lock_irq(&chan->state_lock);
1551 chan->pBufferExchange = 0; 1539 chan->pBufferExchange = 0;
1552 my_dvb_ringbuffer_flush(&dev->tsout_rbuf); 1540 dvb_ringbuffer_flush(&dev->tsout_rbuf);
1553 spin_unlock_irq(&chan->state_lock); 1541 spin_unlock_irq(&chan->state_lock);
1554 } 1542 }
1555} 1543}