Commit 78e2888c authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

media: atomisp: atomisp_csi2.c: remove useless ifdefs

The ifdefs there are meaningless. Just remove them for good.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 02c39233
...@@ -88,12 +88,7 @@ int atomisp_csi2_set_ffmt(struct v4l2_subdev *sd, ...@@ -88,12 +88,7 @@ int atomisp_csi2_set_ffmt(struct v4l2_subdev *sd,
struct v4l2_mbus_framefmt *ffmt) struct v4l2_mbus_framefmt *ffmt)
{ {
struct atomisp_mipi_csi2_device *csi2 = v4l2_get_subdevdata(sd); struct atomisp_mipi_csi2_device *csi2 = v4l2_get_subdevdata(sd);
struct v4l2_mbus_framefmt *actual_ffmt = struct v4l2_mbus_framefmt *actual_ffmt = __csi2_get_format(csi2, cfg, which, pad);
#ifndef ISP2401
__csi2_get_format(csi2, cfg, which, pad);
#else
__csi2_get_format(csi2, cfg, which, pad);
#endif
if (pad == CSI2_PAD_SINK) { if (pad == CSI2_PAD_SINK) {
const struct atomisp_in_fmt_conv *ic; const struct atomisp_in_fmt_conv *ic;
...@@ -119,12 +114,7 @@ int atomisp_csi2_set_ffmt(struct v4l2_subdev *sd, ...@@ -119,12 +114,7 @@ int atomisp_csi2_set_ffmt(struct v4l2_subdev *sd,
} }
/* FIXME: DPCM decompression */ /* FIXME: DPCM decompression */
*actual_ffmt = *ffmt = *actual_ffmt = *ffmt = *__csi2_get_format(csi2, cfg, which, CSI2_PAD_SINK);
#ifndef ISP2401
*__csi2_get_format(csi2, cfg, which, CSI2_PAD_SINK);
#else
*__csi2_get_format(csi2, cfg, which, CSI2_PAD_SINK);
#endif
return 0; return 0;
} }
...@@ -181,9 +171,6 @@ static const struct v4l2_subdev_ops csi2_ops = { ...@@ -181,9 +171,6 @@ static const struct v4l2_subdev_ops csi2_ops = {
.pad = &csi2_pad_ops, .pad = &csi2_pad_ops,
}; };
#ifndef ISP2401
#endif
/* /*
* csi2_link_setup - Setup CSI2 connections. * csi2_link_setup - Setup CSI2 connections.
* @entity : Pointer to media entity structure * @entity : Pointer to media entity structure
...@@ -417,9 +404,6 @@ void atomisp_mipi_csi2_cleanup(struct atomisp_device *isp) ...@@ -417,9 +404,6 @@ void atomisp_mipi_csi2_cleanup(struct atomisp_device *isp)
{ {
} }
#ifndef ISP2401
#endif
int atomisp_mipi_csi2_init(struct atomisp_device *isp) int atomisp_mipi_csi2_init(struct atomisp_device *isp)
{ {
struct atomisp_mipi_csi2_device *csi2_port; struct atomisp_mipi_csi2_device *csi2_port;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment