[PATCH v2] staging: media: Remove unused function atomisp_set_stop_timeout()
The function atomisp_set_stop_timeout on being called, simply returns back. The function hasn't been mentioned in the TODO and doesn't have FIXME code around. Hence, atomisp_set_stop_timeout and its calls have been removed. This was done using Coccinelle. @@ identifier f; @@ void f(...) { -return; } Signed-off-by: simran singhal <singhalsimr...@gmail.com> --- v2: -cc the patch to more developers drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c | 1 - drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h | 1 - drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c | 5 - 3 files changed, 7 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c index d9a5c24..9720756 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c @@ -1692,7 +1692,6 @@ void atomisp_wdt_work(struct work_struct *work) } } #endif - atomisp_set_stop_timeout(ATOMISP_CSS_STOP_TIMEOUT_US); dev_err(isp->dev, "timeout recovery handling done\n"); atomic_set(>wdt_work_queued, 0); diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h index e6b0cce..fb8b8fa 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h @@ -660,7 +660,6 @@ int atomisp_css_set_acc_parameters(struct atomisp_acc_fw *acc_fw); int atomisp_css_isr_thread(struct atomisp_device *isp, bool *frame_done_found, bool *css_pipe_done); -void atomisp_set_stop_timeout(unsigned int timeout); bool atomisp_css_valid_sof(struct atomisp_device *isp); diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c index 6697d72..cfa0ad4 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c @@ -4699,11 +4699,6 @@ int atomisp_css_isr_thread(struct atomisp_device *isp, return 0; } -void atomisp_set_stop_timeout(unsigned int timeout) -{ - return; -} - bool atomisp_css_valid_sof(struct atomisp_device *isp) { unsigned int i, j; -- 2.7.4
Re: [PATCH v1] staging: media: Remove unused function atomisp_set_stop_timeout()
On Sun, Mar 12, 2017 at 7:24 PM, Greg KH <gre...@linuxfoundation.org> wrote: > On Fri, Mar 10, 2017 at 07:05:05PM +0530, simran singhal wrote: >> The function atomisp_set_stop_timeout on being called, simply returns >> back. The function hasn't been mentioned in the TODO and doesn't have >> FIXME code around. Hence, atomisp_set_stop_timeout and its calls have been >> removed. >> >> This was done using Coccinelle. >> >> @@ >> identifier f; >> @@ >> >> void f(...) { >> >> -return; >> >> } >> >> Signed-off-by: simran singhal <singhalsimr...@gmail.com> >> --- >> v1: >>-Change Subject to include name of function >>-change commit message to include the coccinelle script > > You should also cc: the developers doing all of the current work on this > driver, Alan Cox, to get their comment if this really is something that > can be removed or not. > > thanks, > Greg I have cc'd all the developers which script get_maintainer.pl showed: $ git show HEAD | perl scripts/get_maintainer.pl --separator , --nokeywords --nogit --nogit-fallback --norolestats Mauro Carvalho Chehab <mche...@kernel.org>,Greg Kroah-Hartman <gre...@linuxfoundation.org>, linux-media@vger.kernel.org,de...@driverdev.osuosl.org,linux-ker...@vger.kernel.org > greg k-h
[PATCH v1] staging: media: Remove unused function atomisp_set_stop_timeout()
The function atomisp_set_stop_timeout on being called, simply returns back. The function hasn't been mentioned in the TODO and doesn't have FIXME code around. Hence, atomisp_set_stop_timeout and its calls have been removed. This was done using Coccinelle. @@ identifier f; @@ void f(...) { -return; } Signed-off-by: simran singhal <singhalsimr...@gmail.com> --- v1: -Change Subject to include name of function -change commit message to include the coccinelle script drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c | 1 - drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h | 1 - drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c | 5 - 3 files changed, 7 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c index d9a5c24..9720756 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c @@ -1692,7 +1692,6 @@ void atomisp_wdt_work(struct work_struct *work) } } #endif - atomisp_set_stop_timeout(ATOMISP_CSS_STOP_TIMEOUT_US); dev_err(isp->dev, "timeout recovery handling done\n"); atomic_set(>wdt_work_queued, 0); diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h index e6b0cce..fb8b8fa 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h @@ -660,7 +660,6 @@ int atomisp_css_set_acc_parameters(struct atomisp_acc_fw *acc_fw); int atomisp_css_isr_thread(struct atomisp_device *isp, bool *frame_done_found, bool *css_pipe_done); -void atomisp_set_stop_timeout(unsigned int timeout); bool atomisp_css_valid_sof(struct atomisp_device *isp); diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c index 6697d72..cfa0ad4 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c @@ -4699,11 +4699,6 @@ int atomisp_css_isr_thread(struct atomisp_device *isp, return 0; } -void atomisp_set_stop_timeout(unsigned int timeout) -{ - return; -} - bool atomisp_css_valid_sof(struct atomisp_device *isp) { unsigned int i, j; -- 2.7.4
[PATCH 0/2] staging: media: Remove parentheses from return arguments
This patch-series removes unnecessary parantheses from return arguments. simran singhal (2): staging: css2400/sh_css: Remove parentheses from return arguments staging: sh_css_firmware: Remove parentheses from return arguments .../media/atomisp/pci/atomisp2/css2400/sh_css.c | 20 ++-- .../atomisp/pci/atomisp2/css2400/sh_css_firmware.c | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) -- 2.7.4
[PATCH 2/2] staging: sh_css_firmware: Remove parentheses from return arguments
The sematic patch used for this is: @@ identifier i; constant c; @@ return - ( \(i\|-i\|i(...)\|c\) - ) ; Signed-off-by: simran singhal <singhalsimr...@gmail.com> Acked-by: Julia Lawall <julia.law...@lip6.fr> --- drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c index b294e6d..0d7e8cd 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c @@ -74,7 +74,7 @@ static struct fw_param *fw_minibuffer; char *sh_css_get_fw_version(void) { - return(FW_rel_ver_name); + return FW_rel_ver_name; } -- 2.7.4
[PATCH 1/2] staging: css2400/sh_css: Remove parentheses from return arguments
The sematic patch used for this is: @@ identifier i; constant c; @@ return - ( \(i\|-i\|i(...)\|c\) - ) ; Signed-off-by: simran singhal <singhalsimr...@gmail.com> Acked-by: Julia Lawall <julia.law...@lip6.fr> --- .../media/atomisp/pci/atomisp2/css2400/sh_css.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c index 0a1544d..c442d22 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c @@ -1989,7 +1989,7 @@ enum ia_css_err ia_css_suspend(void) for(i=0;i<MAX_ACTIVE_STREAMS;i++) ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "==*> after 1: seed %d (%p)\n", i, my_css_save.stream_seeds[i].stream); ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_suspend() leave\n"); - return(IA_CSS_SUCCESS); + return IA_CSS_SUCCESS; } enum ia_css_err @@ -2001,10 +2001,10 @@ ia_css_resume(void) err = ia_css_init(&(my_css_save.driver_env), my_css_save.loaded_fw, my_css_save.mmu_base, my_css_save.irq_type); if (err != IA_CSS_SUCCESS) - return(err); + return err; err = ia_css_start_sp(); if (err != IA_CSS_SUCCESS) - return(err); + return err; my_css_save.mode = sh_css_mode_resume; for(i=0;i<MAX_ACTIVE_STREAMS;i++) { @@ -2018,7 +2018,7 @@ ia_css_resume(void) if (i) for(j=0;j<i;j++) ia_css_stream_unload(my_css_save.stream_seeds[j].stream); - return(err); + return err; } err = ia_css_stream_start(my_css_save.stream_seeds[i].stream); if (err != IA_CSS_SUCCESS) @@ -2028,7 +2028,7 @@ ia_css_resume(void) ia_css_stream_stop(my_css_save.stream_seeds[j].stream); ia_css_stream_unload(my_css_save.stream_seeds[j].stream); } - return(err); + return err; } *my_css_save.stream_seeds[i].orig_stream = my_css_save.stream_seeds[i].stream; for(j=0;j<my_css_save.stream_seeds[i].num_pipes;j++) @@ -2037,7 +2037,7 @@ ia_css_resume(void) } my_css_save.mode = sh_css_mode_working; ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_resume() leave: return_void\n"); - return(IA_CSS_SUCCESS); + return IA_CSS_SUCCESS; } enum ia_css_err @@ -10226,7 +10226,7 @@ ia_css_stream_load(struct ia_css_stream *stream) for(k=0;k<j;k++) ia_css_pipe_destroy(my_css_save.stream_seeds[i].pipes[k]); } - return(err); + return err; } err = ia_css_stream_create(&(my_css_save.stream_seeds[i].stream_config), my_css_save.stream_seeds[i].num_pipes, my_css_save.stream_seeds[i].pipes, &(my_css_save.stream_seeds[i].stream)); @@ -10235,12 +10235,12 @@ ia_css_stream_load(struct ia_css_stream *stream) ia_css_stream_destroy(stream); for(j=0;j<my_css_save.stream_seeds[i].num_pipes;j++) ia_css_pipe_destroy(my_css_save.stream_seeds[i].pipes[j]); - return(err); + return err; } break; } ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_stream_load() exit, \n"); - return(IA_CSS_SUCCESS); + return IA_CSS_SUCCESS; #else /* TODO remove function - DEPRECATED */ (void)stream; @@ -10381,7 +10381,7 @@ ia_css_stream_unload(struct ia_css_stream *stream) break; } ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_stream_unload() exit, \n"); - return(IA_CSS_SUCCESS); + return IA_CSS_SUCCESS; } #endif -- 2.7.4
[PATCH 2/3] staging: vpfe_mc_capture: Clean up tests if NULL returned on failure
Some functions like kmalloc/kzalloc return NULL on failure. When NULL represents failure, !x is commonly used. This was done using Coccinelle: @@ expression *e; identifier l1; @@ e = \(kmalloc\|kzalloc\|kcalloc\|devm_kzalloc\)(...); ... - e == NULL + !e Signed-off-by: simran singhal <singhalsimr...@gmail.com> --- drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c b/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c index 32109cd..bffe215 100644 --- a/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c +++ b/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c @@ -228,7 +228,7 @@ static int vpfe_enable_clock(struct vpfe_device *vpfe_dev) vpfe_dev->clks = kcalloc(vpfe_cfg->num_clocks, sizeof(*vpfe_dev->clks), GFP_KERNEL); - if (vpfe_dev->clks == NULL) + if (!vpfe_dev->clks) return -ENOMEM; for (i = 0; i < vpfe_cfg->num_clocks; i++) { @@ -348,7 +348,7 @@ static int register_i2c_devices(struct vpfe_device *vpfe_dev) vpfe_dev->sd = kcalloc(num_subdevs, sizeof(struct v4l2_subdev *), GFP_KERNEL); - if (vpfe_dev->sd == NULL) + if (!vpfe_dev->sd) return -ENOMEM; for (i = 0, k = 0; i < num_subdevs; i++) { -- 2.7.4
[PATCH 1/3] staging: atomisp_fops: Clean up tests if NULL returned on failure
Some functions like kmalloc/kzalloc return NULL on failure. When NULL represents failure, !x is commonly used. This was done using Coccinelle: @@ expression *e; identifier l1; @@ e = \(kmalloc\|kzalloc\|kcalloc\|devm_kzalloc\)(...); ... - e == NULL + !e Signed-off-by: simran singhal <singhalsimr...@gmail.com> --- drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c index 20e581e..e5a7407 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c @@ -1100,7 +1100,7 @@ int atomisp_videobuf_mmap_mapper(struct videobuf_queue *q, continue; map = kzalloc(sizeof(struct videobuf_mapping), GFP_KERNEL); - if (map == NULL) { + if (!map) { mutex_unlock(>vb_lock); return -ENOMEM; } -- 2.7.4
[PATCH 3/3] staging: lirc_zilog: Clean up tests if NULL returned on failure
Some functions like kmalloc/kzalloc return NULL on failure. When NULL represents failure, !x is commonly used. This was done using Coccinelle: @@ expression *e; identifier l1; @@ e = \(kmalloc\|kzalloc\|kcalloc\|devm_kzalloc\)(...); ... - e == NULL + !e Signed-off-by: simran singhal <singhalsimr...@gmail.com> --- drivers/staging/media/lirc/lirc_zilog.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/media/lirc/lirc_zilog.c b/drivers/staging/media/lirc/lirc_zilog.c index 34aac3e..4836182 100644 --- a/drivers/staging/media/lirc/lirc_zilog.c +++ b/drivers/staging/media/lirc/lirc_zilog.c @@ -1475,7 +1475,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) ir = get_ir_device_by_adapter(adap); if (ir == NULL) { ir = kzalloc(sizeof(struct IR), GFP_KERNEL); - if (ir == NULL) { + if (!ir) { ret = -ENOMEM; goto out_no_ir; } @@ -1515,7 +1515,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) /* Set up a struct IR_tx instance */ tx = kzalloc(sizeof(struct IR_tx), GFP_KERNEL); - if (tx == NULL) { + if (!tx) { ret = -ENOMEM; goto out_put_xx; } @@ -1559,7 +1559,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) /* Set up a struct IR_rx instance */ rx = kzalloc(sizeof(struct IR_rx), GFP_KERNEL); - if (rx == NULL) { + if (!rx) { ret = -ENOMEM; goto out_put_xx; } -- 2.7.4
[PATCH 0/3] staging: media: Clean up tests if NULL returned on failure
This patch series tests if functions like kmalloc/kzalloc return NULL on failure. When NULL represents failure, !x is commonly used. simran singhal (3): staging: atomisp_fops: Clean up tests if NULL returned on failure staging: vpfe_mc_capture: Clean up tests if NULL returned on failure staging: lirc_zilog: Clean up tests if NULL returned on failure drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c | 2 +- drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c | 4 ++-- drivers/staging/media/lirc/lirc_zilog.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) -- 2.7.4
[PATCH v1 5/7] staging: gc2235: Remove multiple assignments
Remove multiple assignments by factorizing them. Problem found using checkpatch.pl CHECK: multiple assignments should be avoided Signed-off-by: simran singhal <singhalsimr...@gmail.com> --- drivers/staging/media/atomisp/i2c/gc2235.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/media/atomisp/i2c/gc2235.c b/drivers/staging/media/atomisp/i2c/gc2235.c index 198df22..165dcb3 100644 --- a/drivers/staging/media/atomisp/i2c/gc2235.c +++ b/drivers/staging/media/atomisp/i2c/gc2235.c @@ -259,7 +259,8 @@ static int gc2235_get_intg_factor(struct i2c_client *client, return -EINVAL; /* pixel clock calculattion */ - buf->vt_pix_clk_freq_mhz = dev->vt_pix_clk_freq_mhz = 3000; + buf->vt_pix_clk_freq_mhz = 3000; + dev->vt_pix_clk_freq_mhz = 3000; /* get integration time */ buf->coarse_integration_time_min = GC2235_COARSE_INTG_TIME_MIN; -- 2.7.4
[PATCH v1 7/7] staging: gc2235: Do not use multiple blank lines
Remove multiple blank lines. Problem found using checkpatch.pl "CHECK: Please don't use multiple blank lines". Signed-off-by: simran singhal <singhalsimr...@gmail.com> --- drivers/staging/media/atomisp/i2c/gc2235.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/staging/media/atomisp/i2c/gc2235.c b/drivers/staging/media/atomisp/i2c/gc2235.c index 40a5a2f..b97a74b 100644 --- a/drivers/staging/media/atomisp/i2c/gc2235.c +++ b/drivers/staging/media/atomisp/i2c/gc2235.c @@ -244,7 +244,6 @@ static int gc2235_g_fnumber_range(struct v4l2_subdev *sd, s32 *val) return 0; } - static int gc2235_get_intg_factor(struct i2c_client *client, struct camera_mipi_info *info, const struct gc2235_resolution *res) @@ -388,7 +387,6 @@ static long __gc2235_set_exposure(struct v4l2_subdev *sd, int coarse_itg, return ret; } - static int gc2235_set_exposure(struct v4l2_subdev *sd, int exposure, int gain, int digitgain) { @@ -909,7 +907,6 @@ static int gc2235_s_stream(struct v4l2_subdev *sd, int enable) return ret; } - static int gc2235_s_config(struct v4l2_subdev *sd, int irq, void *platform_data) { -- 2.7.4
[PATCH v1 6/7] staging: gc2235: Use x instead of x != NULL
Use x instead of x != NULL . This patch removes the explicit NULL comparisons.This issue is found by checkpatch.pl script. Signed-off-by: simran singhal <singhalsimr...@gmail.com> --- drivers/staging/media/atomisp/i2c/gc2235.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/media/atomisp/i2c/gc2235.c b/drivers/staging/media/atomisp/i2c/gc2235.c index 165dcb3..40a5a2f 100644 --- a/drivers/staging/media/atomisp/i2c/gc2235.c +++ b/drivers/staging/media/atomisp/i2c/gc2235.c @@ -255,7 +255,7 @@ static int gc2235_get_intg_factor(struct i2c_client *client, u16 reg_val, reg_val_h, dummy; int ret; - if (info == NULL) + if (!info) return -EINVAL; /* pixel clock calculattion */ @@ -797,7 +797,7 @@ static int gc2235_set_fmt(struct v4l2_subdev *sd, int idx; gc2235_info = v4l2_get_subdev_hostdata(sd); - if (gc2235_info == NULL) + if (!gc2235_info) return -EINVAL; if (format->pad) return -EINVAL; @@ -917,7 +917,7 @@ static int gc2235_s_config(struct v4l2_subdev *sd, struct i2c_client *client = v4l2_get_subdevdata(sd); int ret = 0; - if (platform_data == NULL) + if (!platform_data) return -ENODEV; dev->platform_data = -- 2.7.4
[PATCH v1 4/7] staging: gc2235: Remove blank line before '}' and after '{' braces
Remove unneeded blank lines preceding/following '}' and '{' braces, as pointed out by checkpatch. This patch addresses the following checkpatch checks: CHECK: Blank lines aren't necessary before a close brace '}' CHECK: Blank lines aren't necessary after an open brace '{' Signed-off-by: simran singhal <singhalsimr...@gmail.com> --- drivers/staging/media/atomisp/i2c/gc2235.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/staging/media/atomisp/i2c/gc2235.c b/drivers/staging/media/atomisp/i2c/gc2235.c index 2ef876a..198df22 100644 --- a/drivers/staging/media/atomisp/i2c/gc2235.c +++ b/drivers/staging/media/atomisp/i2c/gc2235.c @@ -788,7 +788,6 @@ static int gc2235_set_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg, struct v4l2_subdev_format *format) { - struct v4l2_mbus_framefmt *fmt = >format; struct gc2235_device *dev = to_gc2235_sensor(sd); struct i2c_client *client = v4l2_get_subdevdata(sd); @@ -1070,7 +1069,6 @@ static int gc2235_enum_frame_size(struct v4l2_subdev *sd, fse->max_height = gc2235_res[index].height; return 0; - } static int gc2235_g_skip_frames(struct v4l2_subdev *sd, u32 *frames) @@ -1228,7 +1226,6 @@ static int init_gc2235(void) static void exit_gc2235(void) { - i2c_del_driver(_driver); } -- 2.7.4
[PATCH v1 3/7] staging: gc2235: Replace NULL with "!"
Use ! in comparison tests using "==NULL" rather than moving the "==NULL" to the right side of the test. Addesses multiple instances of the checkpatch.pl warning: WARNING: Comparisons should place the constant on the right side of the test Signed-off-by: simran singhal <singhalsimr...@gmail.com> --- drivers/staging/media/atomisp/i2c/gc2235.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/media/atomisp/i2c/gc2235.c b/drivers/staging/media/atomisp/i2c/gc2235.c index 7de7e24..2ef876a 100644 --- a/drivers/staging/media/atomisp/i2c/gc2235.c +++ b/drivers/staging/media/atomisp/i2c/gc2235.c @@ -603,7 +603,7 @@ static int power_up(struct v4l2_subdev *sd) struct i2c_client *client = v4l2_get_subdevdata(sd); int ret; - if (NULL == dev->platform_data) { + if (!dev->platform_data) { dev_err(>dev, "no camera_sensor_platform_data"); return -ENODEV; @@ -647,7 +647,7 @@ static int power_down(struct v4l2_subdev *sd) struct i2c_client *client = v4l2_get_subdevdata(sd); int ret = 0; - if (NULL == dev->platform_data) { + if (!dev->platform_data) { dev_err(>dev, "no camera_sensor_platform_data"); return -ENODEV; -- 2.7.4
[PATCH v1 2/7] staging: gc2235: Add blank line after a declaration
Add blank line after a declaration. Problem found using checkpatch. This patch fixes these warning messages found by checkpatch.pl: WARNING : Missing a blank line after declarations. Signed-off-by: simran singhal <singhalsimr...@gmail.com> --- drivers/staging/media/atomisp/i2c/gc2235.c | 7 +++ 1 file changed, 7 insertions(+) diff --git a/drivers/staging/media/atomisp/i2c/gc2235.c b/drivers/staging/media/atomisp/i2c/gc2235.c index 3f2b11ec..7de7e24 100644 --- a/drivers/staging/media/atomisp/i2c/gc2235.c +++ b/drivers/staging/media/atomisp/i2c/gc2235.c @@ -359,6 +359,7 @@ static long __gc2235_set_exposure(struct v4l2_subdev *sd, int coarse_itg, u16 coarse_integration = (u16)coarse_itg; int ret = 0; u16 expo_coarse_h, expo_coarse_l, gain_val = 0xF0, gain_val2 = 0xF0; + expo_coarse_h = coarse_integration>>8; expo_coarse_l = coarse_integration & 0xff; @@ -410,6 +411,7 @@ static long gc2235_s_exposure(struct v4l2_subdev *sd, /* we should not accept the invalid value below. */ if (gain == 0) { struct i2c_client *client = v4l2_get_subdevdata(sd); + v4l2_err(client, "%s: invalid value\n", __func__); return -EINVAL; } @@ -546,6 +548,7 @@ static int is_init; static int gc2235_init(struct v4l2_subdev *sd) { int ret = 0; + ret = __gc2235_init(sd); return ret; @@ -759,6 +762,7 @@ static int startup(struct v4l2_subdev *sd) struct gc2235_device *dev = to_gc2235_sensor(sd); struct i2c_client *client = v4l2_get_subdevdata(sd); int ret = 0; + if (is_init == 0) { /* force gc2235 to do a reset in res change, otherwise it * can not output normal after switching res. and it is not @@ -893,6 +897,7 @@ static int gc2235_s_stream(struct v4l2_subdev *sd, int enable) struct gc2235_device *dev = to_gc2235_sensor(sd); struct i2c_client *client = v4l2_get_subdevdata(sd); int ret; + mutex_lock(>input_lock); if (enable) @@ -1007,6 +1012,7 @@ static int gc2235_s_parm(struct v4l2_subdev *sd, struct v4l2_streamparm *param) { struct gc2235_device *dev = to_gc2235_sensor(sd); + dev->run_mode = param->parm.capture.capturemode; mutex_lock(>input_lock); @@ -1112,6 +1118,7 @@ static int gc2235_remove(struct i2c_client *client) { struct v4l2_subdev *sd = i2c_get_clientdata(client); struct gc2235_device *dev = to_gc2235_sensor(sd); + dev_dbg(>dev, "gc2235_remove...\n"); if (dev->platform_data->platform_deinit) -- 2.7.4
[PATCH v1 1/7] staging: gc2235: Remove unnecessary typecast of c90 int constant
This patch removes unnecessary typecast of c90 int constant. WARNING: Unnecessary typecast of c90 int constant Signed-off-by: simran singhal <singhalsimr...@gmail.com> --- drivers/staging/media/atomisp/i2c/gc2235.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/media/atomisp/i2c/gc2235.c b/drivers/staging/media/atomisp/i2c/gc2235.c index 3dd5e7f..3f2b11ec 100644 --- a/drivers/staging/media/atomisp/i2c/gc2235.c +++ b/drivers/staging/media/atomisp/i2c/gc2235.c @@ -706,10 +706,10 @@ static int distance(struct gc2235_resolution *res, u32 w, u32 h) h_ratio = ((res->height << 13) / h); if (h_ratio == 0) return -1; - match = abs(((w_ratio << 13) / h_ratio) - ((int)8192)); + match = abs(((w_ratio << 13) / h_ratio) - 8192); - if ((w_ratio < (int)8192) || (h_ratio < (int)8192) || - (match > LARGEST_ALLOWED_RATIO_MISMATCH)) + if ((w_ratio < 8192) || (h_ratio < 8192) || + (match > LARGEST_ALLOWED_RATIO_MISMATCH)) return -1; return w_ratio + h_ratio; -- 2.7.4
[PATCH v1 0/7] staging: gc2235: Multiple checkpatch issues
v1: -change the subject of all the patches of the patch-series simran singhal (7): staging: gc2235: Remove unnecessary typecast of c90 int constant staging: gc2235: Add blank line after a declaration staging: gc2235: Replace NULL with "!" staging: gc2235: Remove blank line before '}' and after '{' braces staging: gc2235: Remove multiple assignments staging: gc2235: Use x instead of x != NULL staging: gc2235: Do not use multiple blank lines drivers/staging/media/atomisp/i2c/gc2235.c | 32 -- 1 file changed, 17 insertions(+), 15 deletions(-) -- 2.7.4
[PATCH] staging: media: Remove unnecessary function and its call
The function atomisp_set_stop_timeout on being called, simply returns back. The function hasn't been mentioned in the TODO and doesn't have FIXME code around. Hence, atomisp_set_stop_timeout and its calls have been removed. Signed-off-by: simran singhal <singhalsimr...@gmail.com> --- drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c | 1 - drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h | 1 - drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c | 5 - 3 files changed, 7 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c index e99f7b8..66299dd 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c @@ -1700,7 +1700,6 @@ void atomisp_wdt_work(struct work_struct *work) } } #endif - atomisp_set_stop_timeout(ATOMISP_CSS_STOP_TIMEOUT_US); dev_err(isp->dev, "timeout recovery handling done\n"); atomic_set(>wdt_work_queued, 0); diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h index 5a404e4..0b9ced5 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h @@ -660,7 +660,6 @@ int atomisp_css_set_acc_parameters(struct atomisp_acc_fw *acc_fw); int atomisp_css_isr_thread(struct atomisp_device *isp, bool *frame_done_found, bool *css_pipe_done); -void atomisp_set_stop_timeout(unsigned int timeout); bool atomisp_css_valid_sof(struct atomisp_device *isp); diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c index 6697d72..cfa0ad4 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c @@ -4699,11 +4699,6 @@ int atomisp_css_isr_thread(struct atomisp_device *isp, return 0; } -void atomisp_set_stop_timeout(unsigned int timeout) -{ - return; -} - bool atomisp_css_valid_sof(struct atomisp_device *isp) { unsigned int i, j; -- 2.7.4
Re: [PATCH 1/7] staging: media: Remove unnecessary typecast of c90 int constant
On Fri, Mar 3, 2017 at 11:15 PM, Sakari Ailus <sakari.ai...@iki.fi> wrote: > Hi Simran, > > On Fri, Mar 03, 2017 at 01:21:56AM +0530, simran singhal wrote: >> This patch removes unnecessary typecast of c90 int constant. >> >> WARNING: Unnecessary typecast of c90 int constant >> >> Signed-off-by: simran singhal <singhalsimr...@gmail.com> > > Which tree are these patches based on? Can you please explain what's the problem with this patch. And please elaborate your question. > > -- > Regards, > > Sakari Ailus > e-mail: sakari.ai...@iki.fi XMPP: sai...@retiisi.org.uk
[PATCH] staging: media: Remove parentheses from return arguments
The sematic patch used for this is: @@ identifier i; constant c; @@ return - ( \(i\|-i\|i(...)\|c\) - ) ; Signed-off-by: simran singhal <singhalsimr...@gmail.com> --- .../media/atomisp/pci/atomisp2/css2400/sh_css.c | 20 ++-- .../atomisp/pci/atomisp2/css2400/sh_css_firmware.c | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c index f39d6f5..1216efb 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c @@ -2009,7 +2009,7 @@ enum ia_css_err ia_css_suspend(void) for(i=0;i<MAX_ACTIVE_STREAMS;i++) ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "==*> after 1: seed %d (%p)\n", i, my_css_save.stream_seeds[i].stream); ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_suspend() leave\n"); - return(IA_CSS_SUCCESS); + return IA_CSS_SUCCESS; } enum ia_css_err @@ -2021,10 +2021,10 @@ ia_css_resume(void) err = ia_css_init(&(my_css_save.driver_env), my_css_save.loaded_fw, my_css_save.mmu_base, my_css_save.irq_type); if (err != IA_CSS_SUCCESS) - return(err); + return err; err = ia_css_start_sp(); if (err != IA_CSS_SUCCESS) - return(err); + return err; my_css_save.mode = sh_css_mode_resume; for(i=0;i<MAX_ACTIVE_STREAMS;i++) { @@ -2038,7 +2038,7 @@ ia_css_resume(void) if (i) for(j=0;j<i;j++) ia_css_stream_unload(my_css_save.stream_seeds[j].stream); - return(err); + return err; } err = ia_css_stream_start(my_css_save.stream_seeds[i].stream); if (err != IA_CSS_SUCCESS) @@ -2048,7 +2048,7 @@ ia_css_resume(void) ia_css_stream_stop(my_css_save.stream_seeds[j].stream); ia_css_stream_unload(my_css_save.stream_seeds[j].stream); } - return(err); + return err; } *my_css_save.stream_seeds[i].orig_stream = my_css_save.stream_seeds[i].stream; for(j=0;j<my_css_save.stream_seeds[i].num_pipes;j++) @@ -2057,7 +2057,7 @@ ia_css_resume(void) } my_css_save.mode = sh_css_mode_working; ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_resume() leave: return_void\n"); - return(IA_CSS_SUCCESS); + return IA_CSS_SUCCESS; } enum ia_css_err @@ -10261,7 +10261,7 @@ ia_css_stream_load(struct ia_css_stream *stream) for(k=0;k<j;k++) ia_css_pipe_destroy(my_css_save.stream_seeds[i].pipes[k]); } - return(err); + return err; } err = ia_css_stream_create(&(my_css_save.stream_seeds[i].stream_config), my_css_save.stream_seeds[i].num_pipes, my_css_save.stream_seeds[i].pipes, &(my_css_save.stream_seeds[i].stream)); @@ -10270,12 +10270,12 @@ ia_css_stream_load(struct ia_css_stream *stream) ia_css_stream_destroy(stream); for(j=0;j<my_css_save.stream_seeds[i].num_pipes;j++) ia_css_pipe_destroy(my_css_save.stream_seeds[i].pipes[j]); - return(err); + return err; } break; } ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_stream_load() exit, \n"); - return(IA_CSS_SUCCESS); + return IA_CSS_SUCCESS; #else /* TODO remove function - DEPRECATED */ (void)stream; @@ -10416,7 +10416,7 @@ ia_css_stream_unload(struct ia_css_stream *stream) break; } ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_stream_unload() exit, \n"); - return(IA_CSS_SUCCESS); + return IA_CSS_SUCCESS; } #endif diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c index b7db3de..d3567ac 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/c
[PATCH 1/7] staging: media: Remove unnecessary typecast of c90 int constant
This patch removes unnecessary typecast of c90 int constant. WARNING: Unnecessary typecast of c90 int constant Signed-off-by: simran singhal <singhalsimr...@gmail.com> --- drivers/staging/media/atomisp/i2c/gc2235.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/media/atomisp/i2c/gc2235.c b/drivers/staging/media/atomisp/i2c/gc2235.c index 3dd5e7f..3f2b11ec 100644 --- a/drivers/staging/media/atomisp/i2c/gc2235.c +++ b/drivers/staging/media/atomisp/i2c/gc2235.c @@ -706,10 +706,10 @@ static int distance(struct gc2235_resolution *res, u32 w, u32 h) h_ratio = ((res->height << 13) / h); if (h_ratio == 0) return -1; - match = abs(((w_ratio << 13) / h_ratio) - ((int)8192)); + match = abs(((w_ratio << 13) / h_ratio) - 8192); - if ((w_ratio < (int)8192) || (h_ratio < (int)8192) || - (match > LARGEST_ALLOWED_RATIO_MISMATCH)) + if ((w_ratio < 8192) || (h_ratio < 8192) || + (match > LARGEST_ALLOWED_RATIO_MISMATCH)) return -1; return w_ratio + h_ratio; -- 2.7.4
[PATCH 2/7] staging: media: Add blank line after a declaration
Add blank line after a declaration. Problem found using checkpatch. This patch fixes these warning messages found by checkpatch.pl: WARNING : Missing a blank line after declarations. Signed-off-by: simran singhal <singhalsimr...@gmail.com> --- drivers/staging/media/atomisp/i2c/gc2235.c | 7 +++ 1 file changed, 7 insertions(+) diff --git a/drivers/staging/media/atomisp/i2c/gc2235.c b/drivers/staging/media/atomisp/i2c/gc2235.c index 3f2b11ec..7de7e24 100644 --- a/drivers/staging/media/atomisp/i2c/gc2235.c +++ b/drivers/staging/media/atomisp/i2c/gc2235.c @@ -359,6 +359,7 @@ static long __gc2235_set_exposure(struct v4l2_subdev *sd, int coarse_itg, u16 coarse_integration = (u16)coarse_itg; int ret = 0; u16 expo_coarse_h, expo_coarse_l, gain_val = 0xF0, gain_val2 = 0xF0; + expo_coarse_h = coarse_integration>>8; expo_coarse_l = coarse_integration & 0xff; @@ -410,6 +411,7 @@ static long gc2235_s_exposure(struct v4l2_subdev *sd, /* we should not accept the invalid value below. */ if (gain == 0) { struct i2c_client *client = v4l2_get_subdevdata(sd); + v4l2_err(client, "%s: invalid value\n", __func__); return -EINVAL; } @@ -546,6 +548,7 @@ static int is_init; static int gc2235_init(struct v4l2_subdev *sd) { int ret = 0; + ret = __gc2235_init(sd); return ret; @@ -759,6 +762,7 @@ static int startup(struct v4l2_subdev *sd) struct gc2235_device *dev = to_gc2235_sensor(sd); struct i2c_client *client = v4l2_get_subdevdata(sd); int ret = 0; + if (is_init == 0) { /* force gc2235 to do a reset in res change, otherwise it * can not output normal after switching res. and it is not @@ -893,6 +897,7 @@ static int gc2235_s_stream(struct v4l2_subdev *sd, int enable) struct gc2235_device *dev = to_gc2235_sensor(sd); struct i2c_client *client = v4l2_get_subdevdata(sd); int ret; + mutex_lock(>input_lock); if (enable) @@ -1007,6 +1012,7 @@ static int gc2235_s_parm(struct v4l2_subdev *sd, struct v4l2_streamparm *param) { struct gc2235_device *dev = to_gc2235_sensor(sd); + dev->run_mode = param->parm.capture.capturemode; mutex_lock(>input_lock); @@ -1112,6 +1118,7 @@ static int gc2235_remove(struct i2c_client *client) { struct v4l2_subdev *sd = i2c_get_clientdata(client); struct gc2235_device *dev = to_gc2235_sensor(sd); + dev_dbg(>dev, "gc2235_remove...\n"); if (dev->platform_data->platform_deinit) -- 2.7.4
[PATCH 7/7] staging: media: Do not use multiple blank lines
Remove multiple blank lines. Problem found using checkpatch.pl "CHECK: Please don't use multiple blank lines". Signed-off-by: simran singhal <singhalsimr...@gmail.com> --- drivers/staging/media/atomisp/i2c/gc2235.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/staging/media/atomisp/i2c/gc2235.c b/drivers/staging/media/atomisp/i2c/gc2235.c index 40a5a2f..b97a74b 100644 --- a/drivers/staging/media/atomisp/i2c/gc2235.c +++ b/drivers/staging/media/atomisp/i2c/gc2235.c @@ -244,7 +244,6 @@ static int gc2235_g_fnumber_range(struct v4l2_subdev *sd, s32 *val) return 0; } - static int gc2235_get_intg_factor(struct i2c_client *client, struct camera_mipi_info *info, const struct gc2235_resolution *res) @@ -388,7 +387,6 @@ static long __gc2235_set_exposure(struct v4l2_subdev *sd, int coarse_itg, return ret; } - static int gc2235_set_exposure(struct v4l2_subdev *sd, int exposure, int gain, int digitgain) { @@ -909,7 +907,6 @@ static int gc2235_s_stream(struct v4l2_subdev *sd, int enable) return ret; } - static int gc2235_s_config(struct v4l2_subdev *sd, int irq, void *platform_data) { -- 2.7.4
[PATCH 6/7] staging: media: Use x instead of x != NULL
Use x instead of x != NULL . This patch removes the explicit NULL comparisons.This issue is found by checkpatch.pl script. Signed-off-by: simran singhal <singhalsimr...@gmail.com> --- drivers/staging/media/atomisp/i2c/gc2235.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/media/atomisp/i2c/gc2235.c b/drivers/staging/media/atomisp/i2c/gc2235.c index 165dcb3..40a5a2f 100644 --- a/drivers/staging/media/atomisp/i2c/gc2235.c +++ b/drivers/staging/media/atomisp/i2c/gc2235.c @@ -255,7 +255,7 @@ static int gc2235_get_intg_factor(struct i2c_client *client, u16 reg_val, reg_val_h, dummy; int ret; - if (info == NULL) + if (!info) return -EINVAL; /* pixel clock calculattion */ @@ -797,7 +797,7 @@ static int gc2235_set_fmt(struct v4l2_subdev *sd, int idx; gc2235_info = v4l2_get_subdev_hostdata(sd); - if (gc2235_info == NULL) + if (!gc2235_info) return -EINVAL; if (format->pad) return -EINVAL; @@ -917,7 +917,7 @@ static int gc2235_s_config(struct v4l2_subdev *sd, struct i2c_client *client = v4l2_get_subdevdata(sd); int ret = 0; - if (platform_data == NULL) + if (!platform_data) return -ENODEV; dev->platform_data = -- 2.7.4
[PATCH 5/7] staging: media: Remove multiple assignments
Remove multiple assignments by factorizing them. Problem found using checkpatch.pl CHECK: multiple assignments should be avoided Signed-off-by: simran singhal <singhalsimr...@gmail.com> --- drivers/staging/media/atomisp/i2c/gc2235.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/media/atomisp/i2c/gc2235.c b/drivers/staging/media/atomisp/i2c/gc2235.c index 198df22..165dcb3 100644 --- a/drivers/staging/media/atomisp/i2c/gc2235.c +++ b/drivers/staging/media/atomisp/i2c/gc2235.c @@ -259,7 +259,8 @@ static int gc2235_get_intg_factor(struct i2c_client *client, return -EINVAL; /* pixel clock calculattion */ - buf->vt_pix_clk_freq_mhz = dev->vt_pix_clk_freq_mhz = 3000; + buf->vt_pix_clk_freq_mhz = 3000; + dev->vt_pix_clk_freq_mhz = 3000; /* get integration time */ buf->coarse_integration_time_min = GC2235_COARSE_INTG_TIME_MIN; -- 2.7.4
[PATCH 4/7] staging: media: Remove blank line before '}' and after '{' braces
Remove unneeded blank lines preceding/following '}' and '{' braces, as pointed out by checkpatch. This patch addresses the following checkpatch checks: CHECK: Blank lines aren't necessary before a close brace '}' CHECK: Blank lines aren't necessary after an open brace '{' Signed-off-by: simran singhal <singhalsimr...@gmail.com> --- drivers/staging/media/atomisp/i2c/gc2235.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/staging/media/atomisp/i2c/gc2235.c b/drivers/staging/media/atomisp/i2c/gc2235.c index 2ef876a..198df22 100644 --- a/drivers/staging/media/atomisp/i2c/gc2235.c +++ b/drivers/staging/media/atomisp/i2c/gc2235.c @@ -788,7 +788,6 @@ static int gc2235_set_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_pad_config *cfg, struct v4l2_subdev_format *format) { - struct v4l2_mbus_framefmt *fmt = >format; struct gc2235_device *dev = to_gc2235_sensor(sd); struct i2c_client *client = v4l2_get_subdevdata(sd); @@ -1070,7 +1069,6 @@ static int gc2235_enum_frame_size(struct v4l2_subdev *sd, fse->max_height = gc2235_res[index].height; return 0; - } static int gc2235_g_skip_frames(struct v4l2_subdev *sd, u32 *frames) @@ -1228,7 +1226,6 @@ static int init_gc2235(void) static void exit_gc2235(void) { - i2c_del_driver(_driver); } -- 2.7.4
[PATCH 3/7] staging: media: Replace NULL with "!"
Use ! in comparison tests using "==NULL" rather than moving the "==NULL" to the right side of the test. Addesses multiple instances of the checkpatch.pl warning: WARNING: Comparisons should place the constant on the right side of the test Signed-off-by: simran singhal <singhalsimr...@gmail.com> --- drivers/staging/media/atomisp/i2c/gc2235.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/media/atomisp/i2c/gc2235.c b/drivers/staging/media/atomisp/i2c/gc2235.c index 7de7e24..2ef876a 100644 --- a/drivers/staging/media/atomisp/i2c/gc2235.c +++ b/drivers/staging/media/atomisp/i2c/gc2235.c @@ -603,7 +603,7 @@ static int power_up(struct v4l2_subdev *sd) struct i2c_client *client = v4l2_get_subdevdata(sd); int ret; - if (NULL == dev->platform_data) { + if (!dev->platform_data) { dev_err(>dev, "no camera_sensor_platform_data"); return -ENODEV; @@ -647,7 +647,7 @@ static int power_down(struct v4l2_subdev *sd) struct i2c_client *client = v4l2_get_subdevdata(sd); int ret = 0; - if (NULL == dev->platform_data) { + if (!dev->platform_data) { dev_err(>dev, "no camera_sensor_platform_data"); return -ENODEV; -- 2.7.4