Skip to content

Commit

Permalink
V4L/DVB (8680): saa7134-core.c: fix warning
Browse files Browse the repository at this point in the history
drivers/media/video/saa7134/saa7134-core.c:366: warning:
'saa7134_buffer_requeue' defined but not used

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Alexander Beregalov authored and Mauro Carvalho Chehab committed Oct 12, 2008
1 parent 3a6b974 commit 05d26cc
Showing 1 changed file with 26 additions and 26 deletions.
52 changes: 26 additions & 26 deletions drivers/media/video/saa7134/saa7134-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -359,32 +359,6 @@ void saa7134_buffer_timeout(unsigned long data)
spin_unlock_irqrestore(&dev->slock,flags);
}

/* resends a current buffer in queue after resume */

static int saa7134_buffer_requeue(struct saa7134_dev *dev,
struct saa7134_dmaqueue *q)
{
struct saa7134_buf *buf, *next;

assert_spin_locked(&dev->slock);

buf = q->curr;
next = buf;
dprintk("buffer_requeue\n");

if (!buf)
return 0;

dprintk("buffer_requeue : resending active buffers \n");

if (!list_empty(&q->queue))
next = list_entry(q->queue.next, struct saa7134_buf,
vb.queue);
buf->activate(dev, buf, next);

return 0;
}

/* ------------------------------------------------------------------ */

int saa7134_set_dmabits(struct saa7134_dev *dev)
Expand Down Expand Up @@ -1139,6 +1113,32 @@ static void __devexit saa7134_finidev(struct pci_dev *pci_dev)
}

#ifdef CONFIG_PM

/* resends a current buffer in queue after resume */
static int saa7134_buffer_requeue(struct saa7134_dev *dev,
struct saa7134_dmaqueue *q)
{
struct saa7134_buf *buf, *next;

assert_spin_locked(&dev->slock);

buf = q->curr;
next = buf;
dprintk("buffer_requeue\n");

if (!buf)
return 0;

dprintk("buffer_requeue : resending active buffers \n");

if (!list_empty(&q->queue))
next = list_entry(q->queue.next, struct saa7134_buf,
vb.queue);
buf->activate(dev, buf, next);

return 0;
}

static int saa7134_suspend(struct pci_dev *pci_dev , pm_message_t state)
{

Expand Down

0 comments on commit 05d26cc

Please sign in to comment.