Fixed coding style issue regarding null comparison at multiple lines. Issue reported by checkpatch.pl
Signed-off-by: Sumit Pundir pundirsumit11@gmail.com --- v2: Updated the patch title and description.
drivers/staging/greybus/camera.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/greybus/camera.c b/drivers/staging/greybus/camera.c index f13f16b..07ebfb8 100644 --- a/drivers/staging/greybus/camera.c +++ b/drivers/staging/greybus/camera.c @@ -918,7 +918,7 @@ static ssize_t gb_camera_debugfs_configure_streams(struct gb_camera *gcam,
/* Retrieve number of streams to configure */ token = strsep(&buf, ";"); - if (token == NULL) + if (!token) return -EINVAL;
ret = kstrtouint(token, 10, &nstreams); @@ -929,7 +929,7 @@ static ssize_t gb_camera_debugfs_configure_streams(struct gb_camera *gcam, return -EINVAL;
token = strsep(&buf, ";"); - if (token == NULL) + if (!token) return -EINVAL;
ret = kstrtouint(token, 10, &flags); @@ -946,7 +946,7 @@ static ssize_t gb_camera_debugfs_configure_streams(struct gb_camera *gcam,
/* width */ token = strsep(&buf, ";"); - if (token == NULL) { + if (!token) { ret = -EINVAL; goto done; } @@ -956,7 +956,7 @@ static ssize_t gb_camera_debugfs_configure_streams(struct gb_camera *gcam,
/* height */ token = strsep(&buf, ";"); - if (token == NULL) + if (!token) goto done;
ret = kstrtouint(token, 10, &stream->height); @@ -965,7 +965,7 @@ static ssize_t gb_camera_debugfs_configure_streams(struct gb_camera *gcam,
/* Image format code */ token = strsep(&buf, ";"); - if (token == NULL) + if (!token) goto done;
ret = kstrtouint(token, 16, &stream->format); @@ -1009,7 +1009,7 @@ static ssize_t gb_camera_debugfs_capture(struct gb_camera *gcam,
/* Request id */ token = strsep(&buf, ";"); - if (token == NULL) + if (!token) return -EINVAL; ret = kstrtouint(token, 10, &request_id); if (ret < 0) @@ -1017,7 +1017,7 @@ static ssize_t gb_camera_debugfs_capture(struct gb_camera *gcam,
/* Stream mask */ token = strsep(&buf, ";"); - if (token == NULL) + if (!token) return -EINVAL; ret = kstrtouint(token, 16, &streams_mask); if (ret < 0) @@ -1025,7 +1025,7 @@ static ssize_t gb_camera_debugfs_capture(struct gb_camera *gcam,
/* number of frames */ token = strsep(&buf, ";"); - if (token == NULL) + if (!token) return -EINVAL; ret = kstrtouint(token, 10, &num_frames); if (ret < 0)
On 01/08/2018 10:50 AM, Sumit Pundir wrote:
Fixed coding style issue regarding null comparison at multiple lines. Issue reported by checkpatch.pl
Signed-off-by: Sumit Pundir pundirsumit11@gmail.com
Looks good. The subject should say "staging" rather than "Staging" but that's probably not a big deal.
Reviewed-by: Alex Elder elder@linaro.org
v2: Updated the patch title and description.
drivers/staging/greybus/camera.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/greybus/camera.c b/drivers/staging/greybus/camera.c index f13f16b..07ebfb8 100644 --- a/drivers/staging/greybus/camera.c +++ b/drivers/staging/greybus/camera.c @@ -918,7 +918,7 @@ static ssize_t gb_camera_debugfs_configure_streams(struct gb_camera *gcam, /* Retrieve number of streams to configure */ token = strsep(&buf, ";");
- if (token == NULL)
- if (!token) return -EINVAL;
ret = kstrtouint(token, 10, &nstreams); @@ -929,7 +929,7 @@ static ssize_t gb_camera_debugfs_configure_streams(struct gb_camera *gcam, return -EINVAL; token = strsep(&buf, ";");
- if (token == NULL)
- if (!token) return -EINVAL;
ret = kstrtouint(token, 10, &flags); @@ -946,7 +946,7 @@ static ssize_t gb_camera_debugfs_configure_streams(struct gb_camera *gcam, /* width */ token = strsep(&buf, ";");
if (token == NULL) {
}if (!token) { ret = -EINVAL; goto done;
@@ -956,7 +956,7 @@ static ssize_t gb_camera_debugfs_configure_streams(struct gb_camera *gcam, /* height */ token = strsep(&buf, ";");
if (token == NULL)
if (!token) goto done;
ret = kstrtouint(token, 10, &stream->height); @@ -965,7 +965,7 @@ static ssize_t gb_camera_debugfs_configure_streams(struct gb_camera *gcam, /* Image format code */ token = strsep(&buf, ";");
if (token == NULL)
if (!token) goto done;
ret = kstrtouint(token, 16, &stream->format); @@ -1009,7 +1009,7 @@ static ssize_t gb_camera_debugfs_capture(struct gb_camera *gcam, /* Request id */ token = strsep(&buf, ";");
- if (token == NULL)
- if (!token) return -EINVAL; ret = kstrtouint(token, 10, &request_id); if (ret < 0)
@@ -1017,7 +1017,7 @@ static ssize_t gb_camera_debugfs_capture(struct gb_camera *gcam, /* Stream mask */ token = strsep(&buf, ";");
- if (token == NULL)
- if (!token) return -EINVAL; ret = kstrtouint(token, 16, &streams_mask); if (ret < 0)
@@ -1025,7 +1025,7 @@ static ssize_t gb_camera_debugfs_capture(struct gb_camera *gcam, /* number of frames */ token = strsep(&buf, ";");
- if (token == NULL)
- if (!token) return -EINVAL; ret = kstrtouint(token, 10, &num_frames); if (ret < 0)
On Mon, Jan 08, 2018 at 10:20:15PM +0530, Sumit Pundir wrote:
Fixed coding style issue regarding null comparison at multiple lines. Issue reported by checkpatch.pl
Signed-off-by: Sumit Pundir pundirsumit11@gmail.com
v2: Updated the patch title and description.
Thanks for the update.
Acked-by: Johan Hovold johan@kernel.org
Johan