bnx2x: Add missing VFs reference in macros

[karo-tx-linux.git] / drivers / media / platform / m2m-deinterlace.c

diff --git a/drivers/media/platform/m2m-deinterlace.c b/drivers/media/platform/m2m-deinterlace.c
index 45164c4f8452975d2bbd12978b3c6d9ff8229118..05c560f2ef062c8f21ba44a943fe004942de0e81 100644 (file)
--- a/drivers/media/platform/m2m-deinterlace.c
+++ b/drivers/media/platform/m2m-deinterlace.c
@@ -218,15 +218,14 @@ static void dma_callback(void *data)
 static void deinterlace_issue_dma(struct deinterlace_ctx *ctx, int op,
                                  int do_callback)
 {
-       struct deinterlace_q_data *s_q_data, *d_q_data;
+       struct deinterlace_q_data *s_q_data;
        struct vb2_buffer *src_buf, *dst_buf;
        struct deinterlace_dev *pcdev = ctx->dev;
        struct dma_chan *chan = pcdev->dma_chan;
        struct dma_device *dmadev = chan->device;
        struct dma_async_tx_descriptor *tx;
        unsigned int s_width, s_height;
-       unsigned int d_width, d_height;
-       unsigned int d_size, s_size;
+       unsigned int s_size;
        dma_addr_t p_in, p_out;
        enum dma_ctrl_flags flags;
 
@@ -238,11 +237,6 @@ static void deinterlace_issue_dma(struct deinterlace_ctx *ctx, int op,
        s_height = s_q_data->height;
        s_size = s_width * s_height;
 
-       d_q_data = get_q_data(V4L2_BUF_TYPE_VIDEO_CAPTURE);
-       d_width = d_q_data->width;
-       d_height = d_q_data->height;
-       d_size = d_width * d_height;
-
        p_in = (dma_addr_t)vb2_dma_contig_plane_dma_addr(src_buf, 0);
        p_out = (dma_addr_t)vb2_dma_contig_plane_dma_addr(dst_buf, 0);
        if (!p_in || !p_out) {
@@ -1108,17 +1102,5 @@ static struct platform_driver deinterlace_pdrv = {
                .owner  = THIS_MODULE,
        },
 };
-
-static void __exit deinterlace_exit(void)
-{
-       platform_driver_unregister(&deinterlace_pdrv);
-}
-
-static int __init deinterlace_init(void)
-{
-       return platform_driver_register(&deinterlace_pdrv);
-}
-
-module_init(deinterlace_init);
-module_exit(deinterlace_exit);
+module_platform_driver(deinterlace_pdrv);