Commit fa49e1d3 authored by Lubomir Rintel's avatar Lubomir Rintel Committed by Mauro Carvalho Chehab
Browse files

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: default avatarLubomir Rintel <lkundrak@v3.sk>
Acked-by: default avatarPavel Machek <pavel@ucw.cz>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 415cd3ac

drivers/media/platform/marvell-ccic/mcam-core.c

+0 −1
Original line number Diff line number Diff line
@@ -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) {

drivers/media/platform/marvell-ccic/mcam-core.h

+0 −2
Original line number Diff line number Diff line
@@ -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;

drivers/media/platform/marvell-ccic/mmp-driver.c

+0 −2
Original line number Diff line number Diff line
@@ -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;

include/linux/platform_data/media/mmp-camera.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */

	/*