media: bttv: remove tvnorm field from bttv_buffer

Instead of storing the tvnorm in each bttv buffer separately, just use the
global bttv tvnorm because the tvnorm does not change per buffer.

Signed-off-by: Deborah Brouwer <deborah.brouwer@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index 0032e143611195006fadbedda16b81485456267d..f32050849691af0e3a01055e912a58df73c2e2a0 100644 (file)
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -1553,7 +1553,7 @@ static int bttv_prepare_buffer(struct videobuf_queue *q,struct bttv *btv,
        /* alloc + fill struct bttv_buffer (if changed) */
        if (buf->vb.width != width || buf->vb.height != height ||
            buf->vb.field != field ||
-           buf->tvnorm != norm || btv->fmt != fmt ||
+           btv->tvnorm != norm || btv->fmt != fmt ||
            buf->crop.top != c.rect.top ||
            buf->crop.left != c.rect.left ||
            buf->crop.width != c.rect.width ||
@@ -1561,7 +1561,7 @@ static int bttv_prepare_buffer(struct videobuf_queue *q,struct bttv *btv,
                buf->vb.width  = width;
                buf->vb.height = height;
                buf->vb.field  = field;
-               buf->tvnorm    = norm;
+               btv->tvnorm    = norm;
                buf->crop      = c.rect;
                redo_dma_risc = 1;
        }

diff --git a/drivers/media/pci/bt8xx/bttv-risc.c b/drivers/media/pci/bt8xx/bttv-risc.c
index 67ea7ed42623922ea74c5c474a67c13030b8de57..0a296dc1a7a56d47abf3d0847e0d85804a0633e6 100644 (file)
--- a/drivers/media/pci/bt8xx/bttv-risc.c
+++ b/drivers/media/pci/bt8xx/bttv-risc.c
@@ -606,7 +606,7 @@ bttv_buffer_activate_video(struct bttv *btv,
 int
 bttv_buffer_risc(struct bttv *btv, struct bttv_buffer *buf)
 {
-       const struct bttv_tvnorm *tvnorm = bttv_tvnorms + buf->tvnorm;
+       const struct bttv_tvnorm *tvnorm = bttv_tvnorms + btv->tvnorm;
        struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);
 
        dprintk("%d: buffer field: %s  format: 0x%08x  size: %dx%d\n",

diff --git a/drivers/media/pci/bt8xx/bttvp.h b/drivers/media/pci/bt8xx/bttvp.h
index 402fe1f1846ef60272fe7a1aadbb246bb14b0389..bbb5fc060fadcab26af445a3ed4e7406626b29d8 100644 (file)
--- a/drivers/media/pci/bt8xx/bttvp.h
+++ b/drivers/media/pci/bt8xx/bttvp.h
@@ -145,7 +145,6 @@ struct bttv_buffer {
        struct videobuf_buffer     vb;
 
        /* bttv specific */
-       unsigned int               tvnorm;
        int                        btformat;
        int                        btswap;
        struct bttv_geometry       geo;