diff options
6 files changed, 6 insertions, 54 deletions
diff --git a/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c b/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c index ad5e1c860e01..4a975b54a977 100644 --- a/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c +++ b/drivers/media/platform/mxc/capture/ipu_bg_overlay_sdc.c @@ -1,6 +1,6 @@ /* - * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved. */ /* @@ -189,10 +189,6 @@ static int csi_enc_setup(cam_data *cam) params.csi_mem.mipi_vc = 0; params.csi_mem.mipi_id = 0; } - } else { - printk(KERN_ERR "%s() in %s: Fail to get mipi_csi2_info!\n", - __func__, __FILE__); - return -EPERM; } #endif @@ -411,10 +407,6 @@ static int bg_overlay_stop(void *private) && cam->csi == csi_id) mipi_csi2_pixelclk_disable(mipi_csi2_info); } - } else { - printk(KERN_ERR "%s() in %s: Fail to get mipi_csi2_info!\n", - __func__, __FILE__); - return -EPERM; } #endif diff --git a/drivers/media/platform/mxc/capture/ipu_csi_enc.c b/drivers/media/platform/mxc/capture/ipu_csi_enc.c index 4752f7701c04..fb3c6a24322a 100644 --- a/drivers/media/platform/mxc/capture/ipu_csi_enc.c +++ b/drivers/media/platform/mxc/capture/ipu_csi_enc.c @@ -1,5 +1,5 @@ /* - * Copyright 2009-2013 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2009-2014 Freescale Semiconductor, Inc. All Rights Reserved. */ /* @@ -157,10 +157,6 @@ static int csi_enc_setup(cam_data *cam) params.csi_mem.mipi_vc = 0; params.csi_mem.mipi_id = 0; } - } else { - printk(KERN_ERR "%s() in %s: Fail to get mipi_csi2_info!\n", - __func__, __FILE__); - return -EPERM; } #endif @@ -309,10 +305,6 @@ static int csi_enc_disabling_tasks(void *private) && cam->csi == csi_id) mipi_csi2_pixelclk_disable(mipi_csi2_info); } - } else { - printk(KERN_ERR "%s() in %s: Fail to get mipi_csi2_info!\n", - __func__, __FILE__); - return -EPERM; } #endif diff --git a/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c b/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c index 416b40b8046c..80136156ceaf 100644 --- a/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c +++ b/drivers/media/platform/mxc/capture/ipu_fg_overlay_sdc.c @@ -1,5 +1,5 @@ /* - * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved. */ /* * The code contained herein is licensed under the GNU General Public * License. You may obtain a copy of the GNU General Public License @@ -195,10 +195,6 @@ static int csi_enc_setup(cam_data *cam) params.csi_mem.mipi_vc = 0; params.csi_mem.mipi_id = 0; } - } else { - printk(KERN_ERR "%s() in %s: Fail to get mipi_csi2_info!\n", - __func__, __FILE__); - return -EPERM; } #endif @@ -508,10 +504,6 @@ static int foreground_stop(void *private) && cam->csi == csi_id) mipi_csi2_pixelclk_disable(mipi_csi2_info); } - } else { - printk(KERN_ERR "%s() in %s: Fail to get mipi_csi2_info!\n", - __func__, __FILE__); - return -EPERM; } #endif diff --git a/drivers/media/platform/mxc/capture/ipu_prp_enc.c b/drivers/media/platform/mxc/capture/ipu_prp_enc.c index c16312761d7d..af419e356e6d 100644 --- a/drivers/media/platform/mxc/capture/ipu_prp_enc.c +++ b/drivers/media/platform/mxc/capture/ipu_prp_enc.c @@ -1,5 +1,5 @@ /* - * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved. */ /* @@ -161,10 +161,6 @@ static int prp_enc_setup(cam_data *cam) enc.csi_prp_enc_mem.mipi_vc = 0; enc.csi_prp_enc_mem.mipi_id = 0; } - } else { - printk(KERN_ERR "%s() in %s: Fail to get mipi_csi2_info!\n", - __func__, __FILE__); - return -EPERM; } #endif @@ -471,10 +467,6 @@ static int prp_enc_disabling_tasks(void *private) && cam->csi == csi_id) mipi_csi2_pixelclk_disable(mipi_csi2_info); } - } else { - printk(KERN_ERR "%s() in %s: Fail to get mipi_csi2_info!\n", - __func__, __FILE__); - return -EPERM; } #endif diff --git a/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c b/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c index 8bf5344df684..b9610f1ed820 100644 --- a/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c +++ b/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc.c @@ -1,5 +1,5 @@ /* - * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved. */ /* * The code contained herein is licensed under the GNU General Public * License. You may obtain a copy of the GNU General Public License @@ -196,10 +196,6 @@ static int prpvf_start(void *private) vf.csi_prp_vf_mem.mipi_vc = 0; vf.csi_prp_vf_mem.mipi_id = 0; } - } else { - printk(KERN_ERR "%s() in %s: Fail to get mipi_csi2_info!\n", - __func__, __FILE__); - return -EPERM; } #endif @@ -458,10 +454,6 @@ static int prpvf_stop(void *private) && cam->csi == csi_id) mipi_csi2_pixelclk_disable(mipi_csi2_info); } - } else { - printk(KERN_ERR "%s() in %s: Fail to get mipi_csi2_info!\n", - __func__, __FILE__); - return -EPERM; } #endif diff --git a/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c b/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c index 2667fca81a76..a24d82dfca63 100644 --- a/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c +++ b/drivers/media/platform/mxc/capture/ipu_prp_vf_sdc_bg.c @@ -1,5 +1,5 @@ /* - * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved. */ /* @@ -181,10 +181,6 @@ static int prpvf_start(void *private) vf.csi_prp_vf_mem.mipi_vc = 0; vf.csi_prp_vf_mem.mipi_id = 0; } - } else { - printk(KERN_ERR "%s() in %s: Fail to get mipi_csi2_info!\n", - __func__, __FILE__); - return -EPERM; } #endif @@ -387,10 +383,6 @@ static int prpvf_stop(void *private) && cam->csi == csi_id) mipi_csi2_pixelclk_disable(mipi_csi2_info); } - } else { - printk(KERN_ERR "%s() in %s: Fail to get mipi_csi2_info!\n", - __func__, __FILE__); - return -EPERM; } #endif |