media: marvell-ccic: drop unused stuff

Remove structure members and headers that are not actually used. Saves
us from some noise in subsequent cleanup commits.

Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c
index 2494a31de01bd2c7293cbbbed86e1d1d974be50b..76641d5211ab6e683c8e20b39fa706c24002c01b 100644 (file)
--- a/drivers/media/platform/marvell-ccic/mcam-core.c
+++ b/drivers/media/platform/marvell-ccic/mcam-core.c
@@ -1776,7 +1776,6 @@ int mccic_register(struct mcam_camera *cam)
         */
        sensor_cfg.clock_speed = cam->clock_speed;
        sensor_cfg.use_smbus = cam->use_smbus;
-       cam->sensor_addr = ov7670_info.addr;
        cam->sensor = v4l2_i2c_new_subdev_board(&cam->v4l2_dev,
                        cam->i2c_adapter, &ov7670_info, NULL);
        if (cam->sensor == NULL) {

diff --git a/drivers/media/platform/marvell-ccic/mcam-core.h b/drivers/media/platform/marvell-ccic/mcam-core.h
index a3a097a45e78b7111dc7546db5da79e767d76e2e..b828b1bb59d33f100d644d9d288f7d183d5468df 100644 (file)
--- a/drivers/media/platform/marvell-ccic/mcam-core.h
+++ b/drivers/media/platform/marvell-ccic/mcam-core.h
@@ -112,7 +112,6 @@ struct mcam_camera {
        short int use_smbus;    /* SMBUS or straight I2c? */
        enum mcam_buffer_mode buffer_mode;
 
-       int mclk_min;   /* The minimal value of mclk */
        int mclk_src;   /* which clock source the mclk derives from */
        int mclk_div;   /* Clock Divider Value for MCLK */
 
@@ -152,7 +151,6 @@ struct mcam_camera {
         */
        struct video_device vdev;
        struct v4l2_subdev *sensor;
-       unsigned short sensor_addr;
 
        /* Videobuf2 stuff */
        struct vb2_queue vb_queue;

diff --git a/drivers/media/platform/marvell-ccic/mmp-driver.c b/drivers/media/platform/marvell-ccic/mmp-driver.c
index 9c4c7d37d0dfae53222a391a498ba86aa8c31fb9..25a4e2b580f428d93c86085531a0912d8dae5d3c 100644 (file)
--- a/drivers/media/platform/marvell-ccic/mmp-driver.c
+++ b/drivers/media/platform/marvell-ccic/mmp-driver.c
@@ -10,7 +10,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/i2c.h>
-#include <linux/platform_data/i2c-gpio.h>
 #include <linux/interrupt.h>
 #include <linux/spinlock.h>
 #include <linux/slab.h>
@@ -330,7 +329,6 @@ static int mmpcam_probe(struct platform_device *pdev)
        mcam->calc_dphy = mmpcam_calc_dphy;
        mcam->dev = &pdev->dev;
        mcam->use_smbus = 0;
-       mcam->mclk_min = pdata->mclk_min;
        mcam->mclk_src = pdata->mclk_src;
        mcam->mclk_div = pdata->mclk_div;
        mcam->bus_type = pdata->bus_type;

diff --git a/include/linux/platform_data/media/mmp-camera.h b/include/linux/platform_data/media/mmp-camera.h
index d2d3a443eedf67abd9dfbc1e2a3755f1e290d536..4c3a80a4588342fb61834e017131dbb2730a6f79 100644 (file)
--- a/include/linux/platform_data/media/mmp-camera.h
+++ b/include/linux/platform_data/media/mmp-camera.h
@@ -16,7 +16,6 @@ struct mmp_camera_platform_data {
        int sensor_power_gpio;
        int sensor_reset_gpio;
        enum v4l2_mbus_type bus_type;
-       int mclk_min;   /* The minimal value of MCLK */
        int mclk_src;   /* which clock source the MCLK derives from */
        int mclk_div;   /* Clock Divider Value for MCLK */
        /*