summaryrefslogtreecommitdiffstats
path: root/drivers/staging/media/atomisp/pci/atomisp2
diff options
context:
space:
mode:
authorAndy Shevchenko2017-09-27 20:25:04 +0200
committerMauro Carvalho Chehab2017-10-31 11:23:45 +0100
commit4eee79141bc51ff5de9145f50298d8495dc67a8b (patch)
tree553343cb13ed4fdc48c053f03097a79dc032fcd7 /drivers/staging/media/atomisp/pci/atomisp2
parentmedia: staging: atomisp: Remove duplicate declaration in header (diff)
downloadkernel-qcow2-linux-4eee79141bc51ff5de9145f50298d8495dc67a8b.tar.gz
kernel-qcow2-linux-4eee79141bc51ff5de9145f50298d8495dc67a8b.tar.xz
kernel-qcow2-linux-4eee79141bc51ff5de9145f50298d8495dc67a8b.zip
media: staging: atomisp: Remove unused members of camera_sensor_platform_data
Remove unused members along with dead code. Mostly done with help of coccinelle. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp2')
-rw-r--r--drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c
index 20aff7faf44a..6d2920155fa4 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c
@@ -750,7 +750,6 @@ static int atomisp_subdev_probe(struct atomisp_device *isp)
&subdevs->v4l2_subdev.board_info;
struct i2c_adapter *adapter =
i2c_get_adapter(subdevs->v4l2_subdev.i2c_adapter_id);
- struct camera_sensor_platform_data *sensor_pdata;
int sensor_num, i;
if (adapter == NULL) {
@@ -802,13 +801,7 @@ static int atomisp_subdev_probe(struct atomisp_device *isp)
* pixel_format.
*/
isp->inputs[isp->input_cnt].frame_size.pixel_format = 0;
- sensor_pdata = (struct camera_sensor_platform_data *)
- board_info->platform_data;
- if (sensor_pdata->get_camera_caps)
- isp->inputs[isp->input_cnt].camera_caps =
- sensor_pdata->get_camera_caps();
- else
- isp->inputs[isp->input_cnt].camera_caps =
+ isp->inputs[isp->input_cnt].camera_caps =
atomisp_get_default_camera_caps();
sensor_num = isp->inputs[isp->input_cnt]
.camera_caps->sensor_num;