From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Wed, 12 Oct 2016 15:13:50 +0000 Subject: [PATCH 32/34] [media] DaVinci-VPIF-Display: Adjust 11 checks for null pointers Message-Id: List-Id: References: In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: quoted-printable To: linux-media@vger.kernel.org, Hans Verkuil , "Lad, Prabhakar" , Mauro Carvalho Chehab Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: Markus Elfring Date: Wed, 12 Oct 2016 15:40:32 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit The script "checkpatch.pl" pointed information out like the following. Comparison to NULL could be written =E2=80=A6 Thus fix the affected source code places. Signed-off-by: Markus Elfring --- drivers/media/platform/davinci/vpif_display.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/= platform/davinci/vpif_display.c index 3347fa14..fff1ece 100644 --- a/drivers/media/platform/davinci/vpif_display.c +++ b/drivers/media/platform/davinci/vpif_display.c @@ -271,10 +271,10 @@ static void vpif_stop_streaming(struct vb2_queue *vq) vb2_buffer_done(&common->cur_frm->vb.vb2_buf, VB2_BUF_STATE_ERROR); } else { - if (common->cur_frm !=3D NULL) + if (common->cur_frm) vb2_buffer_done(&common->cur_frm->vb.vb2_buf, VB2_BUF_STATE_ERROR); - if (common->next_frm !=3D NULL) + if (common->next_frm) vb2_buffer_done(&common->next_frm->vb.vb2_buf, VB2_BUF_STATE_ERROR); } @@ -686,7 +686,7 @@ static int vpif_s_std(struct file *file, void *priv, v4= l2_std_id std_id) struct v4l2_output output; int ret; =20 - if (config->chan_config[ch->channel_id].outputs =3D NULL) + if (!config->chan_config[ch->channel_id].outputs) return -ENODATA; =20 chan_cfg =3D &config->chan_config[ch->channel_id]; @@ -732,7 +732,7 @@ static int vpif_g_std(struct file *file, void *priv, v4= l2_std_id *std) struct vpif_display_chan_config *chan_cfg; struct v4l2_output output; =20 - if (config->chan_config[ch->channel_id].outputs =3D NULL) + if (!config->chan_config[ch->channel_id].outputs) return -ENODATA; =20 chan_cfg =3D &config->chan_config[ch->channel_id]; @@ -783,11 +783,11 @@ vpif_output_to_subdev(struct vpif_display_config *vpi= f_cfg, =20 vpif_dbg(2, debug, "vpif_output_to_subdev\n"); =20 - if (chan_cfg->outputs =3D NULL) + if (!chan_cfg->outputs) return -1; =20 subdev_name =3D chan_cfg->outputs[index].subdev_name; - if (subdev_name =3D NULL) + if (!subdev_name) return -1; =20 /* loop through the sub device list to get the sub device info */ @@ -833,7 +833,7 @@ static int vpif_set_output(struct vpif_display_config *= vpif_cfg, } ch->output_idx =3D index; ch->sd =3D sd; - if (chan_cfg->outputs !=3D NULL) + if (chan_cfg->outputs) /* update tvnorms from the sub device output info */ ch->video_dev.tvnorms =3D chan_cfg->outputs[index].output.std; return 0; @@ -885,7 +885,7 @@ vpif_enum_dv_timings(struct file *file, void *priv, struct v4l2_output output; int ret; =20 - if (config->chan_config[ch->channel_id].outputs =3D NULL) + if (!config->chan_config[ch->channel_id].outputs) return -ENODATA; =20 chan_cfg =3D &config->chan_config[ch->channel_id]; @@ -922,7 +922,7 @@ static int vpif_s_dv_timings(struct file *file, void *p= riv, struct v4l2_output output; int ret; =20 - if (config->chan_config[ch->channel_id].outputs =3D NULL) + if (!config->chan_config[ch->channel_id].outputs) return -ENODATA; =20 chan_cfg =3D &config->chan_config[ch->channel_id]; @@ -1021,7 +1021,7 @@ static int vpif_g_dv_timings(struct file *file, void = *priv, struct video_obj *vid_ch =3D &ch->video; struct v4l2_output output; =20 - if (config->chan_config[ch->channel_id].outputs =3D NULL) + if (!config->chan_config[ch->channel_id].outputs) goto error; =20 chan_cfg =3D &config->chan_config[ch->channel_id]; @@ -1280,7 +1280,7 @@ static __init int vpif_probe(struct platform_device *= pdev) subdev_count =3D vpif_obj.config->subdev_count; subdevdata =3D vpif_obj.config->subdevinfo; vpif_obj.sd =3D kcalloc(subdev_count, sizeof(*vpif_obj.sd), GFP_KERNEL); - if (vpif_obj.sd =3D NULL) { + if (!vpif_obj.sd) { err =3D -ENOMEM; goto vpif_unregister; } --=20 2.10.1 -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" = in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mout.web.de ([212.227.15.4]:61997 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933838AbcJLPOB (ORCPT ); Wed, 12 Oct 2016 11:14:01 -0400 Subject: [PATCH 32/34] [media] DaVinci-VPIF-Display: Adjust 11 checks for null pointers To: linux-media@vger.kernel.org, Hans Verkuil , "Lad, Prabhakar" , Mauro Carvalho Chehab References: Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: Date: Wed, 12 Oct 2016 17:13:50 +0200 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-media-owner@vger.kernel.org List-ID: From: Markus Elfring Date: Wed, 12 Oct 2016 15:40:32 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The script "checkpatch.pl" pointed information out like the following. Comparison to NULL could be written … Thus fix the affected source code places. Signed-off-by: Markus Elfring --- drivers/media/platform/davinci/vpif_display.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c index 3347fa14..fff1ece 100644 --- a/drivers/media/platform/davinci/vpif_display.c +++ b/drivers/media/platform/davinci/vpif_display.c @@ -271,10 +271,10 @@ static void vpif_stop_streaming(struct vb2_queue *vq) vb2_buffer_done(&common->cur_frm->vb.vb2_buf, VB2_BUF_STATE_ERROR); } else { - if (common->cur_frm != NULL) + if (common->cur_frm) vb2_buffer_done(&common->cur_frm->vb.vb2_buf, VB2_BUF_STATE_ERROR); - if (common->next_frm != NULL) + if (common->next_frm) vb2_buffer_done(&common->next_frm->vb.vb2_buf, VB2_BUF_STATE_ERROR); } @@ -686,7 +686,7 @@ static int vpif_s_std(struct file *file, void *priv, v4l2_std_id std_id) struct v4l2_output output; int ret; - if (config->chan_config[ch->channel_id].outputs == NULL) + if (!config->chan_config[ch->channel_id].outputs) return -ENODATA; chan_cfg = &config->chan_config[ch->channel_id]; @@ -732,7 +732,7 @@ static int vpif_g_std(struct file *file, void *priv, v4l2_std_id *std) struct vpif_display_chan_config *chan_cfg; struct v4l2_output output; - if (config->chan_config[ch->channel_id].outputs == NULL) + if (!config->chan_config[ch->channel_id].outputs) return -ENODATA; chan_cfg = &config->chan_config[ch->channel_id]; @@ -783,11 +783,11 @@ vpif_output_to_subdev(struct vpif_display_config *vpif_cfg, vpif_dbg(2, debug, "vpif_output_to_subdev\n"); - if (chan_cfg->outputs == NULL) + if (!chan_cfg->outputs) return -1; subdev_name = chan_cfg->outputs[index].subdev_name; - if (subdev_name == NULL) + if (!subdev_name) return -1; /* loop through the sub device list to get the sub device info */ @@ -833,7 +833,7 @@ static int vpif_set_output(struct vpif_display_config *vpif_cfg, } ch->output_idx = index; ch->sd = sd; - if (chan_cfg->outputs != NULL) + if (chan_cfg->outputs) /* update tvnorms from the sub device output info */ ch->video_dev.tvnorms = chan_cfg->outputs[index].output.std; return 0; @@ -885,7 +885,7 @@ vpif_enum_dv_timings(struct file *file, void *priv, struct v4l2_output output; int ret; - if (config->chan_config[ch->channel_id].outputs == NULL) + if (!config->chan_config[ch->channel_id].outputs) return -ENODATA; chan_cfg = &config->chan_config[ch->channel_id]; @@ -922,7 +922,7 @@ static int vpif_s_dv_timings(struct file *file, void *priv, struct v4l2_output output; int ret; - if (config->chan_config[ch->channel_id].outputs == NULL) + if (!config->chan_config[ch->channel_id].outputs) return -ENODATA; chan_cfg = &config->chan_config[ch->channel_id]; @@ -1021,7 +1021,7 @@ static int vpif_g_dv_timings(struct file *file, void *priv, struct video_obj *vid_ch = &ch->video; struct v4l2_output output; - if (config->chan_config[ch->channel_id].outputs == NULL) + if (!config->chan_config[ch->channel_id].outputs) goto error; chan_cfg = &config->chan_config[ch->channel_id]; @@ -1280,7 +1280,7 @@ static __init int vpif_probe(struct platform_device *pdev) subdev_count = vpif_obj.config->subdev_count; subdevdata = vpif_obj.config->subdevinfo; vpif_obj.sd = kcalloc(subdev_count, sizeof(*vpif_obj.sd), GFP_KERNEL); - if (vpif_obj.sd == NULL) { + if (!vpif_obj.sd) { err = -ENOMEM; goto vpif_unregister; } -- 2.10.1